diff -Naur -x build -x .git trunk/.gitignore vendor\current\crengine/.gitignore --- trunk/.gitignore 1970-01-01 00:00:00.000000000 +++ vendor\current\crengine/.gitignore 2012-09-13 14:14:24.000000000 +0200 @@ -0,0 +1,9 @@ +*.*~ +qtbuild +v3build +v5build +wxbuild +qtbuild +qt-build +qtcreator-build +*~ diff -Naur -x build -x .git trunk/CMakeLists.txt vendor\current\crengine/CMakeLists.txt --- trunk/CMakeLists.txt 2012-09-13 15:57:06.000000000 +0200 +++ vendor\current\crengine/CMakeLists.txt 2012-09-13 14:14:24.000000000 +0200 @@ -97,8 +97,6 @@ ADD_DEFINITIONS( -DMAC=1 -DLINUX=1 -D_LINUX=1 -DCR_EMULATE_GETTEXT=1 ) elseif ( WIN32 ) ADD_DEFINITIONS( -DWIN32=1 -D_WIN32=1 -DCR_EMULATE_GETTEXT=1 ) -elseif ( OS2 ) - ADD_DEFINITIONS( -DOS2=1 -D_OS2=1 ) else() ADD_DEFINITIONS( -DLINUX=1 -D_LINUX=1 ) endif(MAC) diff -Naur -x build -x .git trunk/cr3qt/CMakeLists.txt vendor\current\crengine/cr3qt/CMakeLists.txt --- trunk/cr3qt/CMakeLists.txt 2012-09-13 16:54:12.000000000 +0200 +++ vendor\current\crengine/cr3qt/CMakeLists.txt 2012-09-13 14:14:26.000000000 +0200 @@ -48,10 +48,6 @@ ADD_DEFINITIONS(-DCR3_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/cr3/" -DUSE_FONTCONFIG=1 ) -ELSEIF (OS2) - ADD_DEFINITIONS(-DCR3_DATA_DIR="" - -DUSE_FONTCONFIG=1 - ) ELSE() ADD_DEFINITIONS(-DCR3_DATA_DIR="" -DUSE_FONTCONFIG=0 @@ -75,16 +71,6 @@ endif(MINGW) ENDIF (WIN32) -IF (OS2) - # init of the rc compiler - set(RES_FILES "src/cr3_os2.rc") - ENABLE_LANGUAGE(RC) - set(CMAKE_RC_COMPILER_INIT rc) - SET(CMAKE_RC_COMPILE_OBJECT - " -n -r -i ${CMAKE_CURRENT_SOURCE_DIR}/src ") - - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zstack 0x2000 -Zlinker \"DISABLE 1121\" -s -Zlinker /PM:PM -Zno-fork -Zhigh-mem -Zmap") -ENDIF (OS2) SET(LANGUAGES ru uk cs de es pl bg hu) message( "Languages: ${LANGUAGES}" ) @@ -172,8 +158,6 @@ #${QT_LIBRARIES} ELSEIF (UNIX) SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} ) -ELSEIF (OS2) - SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} fontconfig xml2 mmap) ELSE() SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES}) ENDIF(MAC) diff -Naur -x build -x .git trunk/cr3qt/src/cr3_os2.rc vendor\current\crengine/cr3qt/src/cr3_os2.rc --- trunk/cr3qt/src/cr3_os2.rc 2011-09-30 14:59:06.000000000 +0200 +++ vendor\current\crengine/cr3qt/src/cr3_os2.rc 1970-01-01 00:00:00.000000000 @@ -1 +0,0 @@ -ICON 1 DISCARDABLE "icons/cr3_os2.ico" \ No newline at end of file diff -Naur -x build -x .git trunk/cr3qt/src/icons/cr3_os2.ico vendor\current\crengine/cr3qt/src/icons/cr3_os2.ico --- trunk/cr3qt/src/icons/cr3_os2.ico 2011-06-06 14:37:56.000000000 +0200 +++ vendor\current\crengine/cr3qt/src/icons/cr3_os2.ico 1970-01-01 00:00:00.000000000 @@ -1 +0,0 @@ -CI": (PCI" ((۪IImUmmm$U$UUU+U+++$+U$+$+$+I+UI+I+I+m+Um+m+m++U++++U++++U++++U+++UUUUU$UU$U$U$UIUUIUIUIUmUUmUmUmUUUUUUUUUUUUUUUUUUUUUUUU$$U$$$IUIIImUmmm'''...666>>>FFFMMMUUU]]]dddlllttt|||$IUUۀUۀۀۀUU$U$$$IUIIImUmmmUU۪U۪۪UIUUժ$U$ժ$$IUIժIImUmժmmUժUժUժUժUUU$U$$$IUIIImUmmmUU۪mmUUU++$$+UI++mm+U+++U+++UUU$$UUIUUmmUUUUUUUUUU$$UIm''66>MMM]ddtt|IUUۀU$$UImmUU۪U$$UImmU}y~zy}}z{rz~ppuuz{xzzq|ttyyzy||~~~zvwv~~}y~~~|}z~z~~|{vyxvt|{{~w~{x~~{|zpywwy}{z||xy|ty}zypy{||~zywwruxq{~~{xurwrsr~}~uuvvqqtxtwwyw|rqyzyyxz}uxwzzz~wyy{xvzz|~u~~qw~pqpvy|}q~wy|yuxxvqzqv{uywz|wr|xv}|z}~~|t|xpq~yqqupszvr}~vuvps~}~rr~yupsw~zxrw|}~}} \ No newline at end of file diff -Naur -x build -x .git trunk/cr3qt/src/main.cpp vendor\current\crengine/cr3qt/src/main.cpp --- trunk/cr3qt/src/main.cpp 2012-09-13 16:58:54.000000000 +0200 +++ vendor\current\crengine/cr3qt/src/main.cpp 2012-09-13 14:14:26.000000000 +0200 @@ -156,7 +156,7 @@ QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/Contents/Resources/"); //QDir::separator(); QString translations = exeDir + "i18n"; #else -#if defined(_WIN32) || defined(Q_OS_OS2) +#if defined(_WIN32) QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/"); //QDir::separator(); QString translations = exeDir + "i18n"; #else @@ -308,7 +308,7 @@ bool InitCREngine( const char * exename, lString16Collection & fontDirs ) { CRLog::trace("InitCREngine(%s)", exename); -#if defined(_WIN32) || defined(Q_OS_OS2) +#ifdef _WIN32 lString16 appname( exename ); int lastSlash=-1; lChar16 slashChar = '/'; diff -Naur -x build -x .git trunk/crengine/include/crsetup.h vendor\current\crengine/crengine/include/crsetup.h --- trunk/crengine/include/crsetup.h 2012-09-13 16:33:48.000000000 +0200 +++ vendor\current\crengine/crengine/include/crsetup.h 2012-09-13 14:14:26.000000000 +0200 @@ -48,7 +48,7 @@ #define FILE_STREAM_BUFFER_SIZE 0x40000 #endif -#elif defined(_LINUX) || defined (LINUX) || defined(_OS2) || defined (OS2) +#elif defined(_LINUX) || defined (LINUX) #ifndef LDOM_USE_OWN_MEM_MAN #define LDOM_USE_OWN_MEM_MAN 1 diff -Naur -x build -x .git trunk/crengine/src/lvstream.cpp vendor\current\crengine/crengine/src/lvstream.cpp --- trunk/crengine/src/lvstream.cpp 2012-09-13 17:08:32.000000000 +0200 +++ vendor\current\crengine/crengine/src/lvstream.cpp 2012-09-13 14:14:26.000000000 +0200 @@ -54,7 +54,7 @@ #include #endif -#if defined(_LINUX) || defined(_OS2) +#ifdef _LINUX #include #include #include @@ -302,7 +302,7 @@ //#if USE__FILES==1 -#if defined(_LINUX) || defined(_WIN32) || defined(_OS2) +#if defined(_LINUX) || defined(_WIN32) class LVFileMappedStream : public LVNamedStream { @@ -828,9 +828,7 @@ //#ifdef _LINUX -#ifndef _OS2 #undef USE_ANSI_FILES -#endif //#endif #if (USE_ANSI_FILES==1) @@ -3519,7 +3517,7 @@ lChar16 c = pathName[0]; if ( c=='\\' || c=='/' ) return true; -#if defined(_WIN32) || defined(_OS2) +#ifdef _WIN32 if ( (c>='a' && c<='z') || (c>='A' && c<='Z') ) { return (pathName[1]==':'); } @@ -3762,7 +3760,7 @@ */ LVStreamRef LVMapFileStream( const lChar16 * pathname, lvopen_mode_t mode, lvsize_t minSize ) { -#if !defined(_WIN32) && !defined(_LINUX) && !defined(_OS2) +#if !defined(_WIN32) && !defined(_LINUX) // STUB for systems w/o mmap LVFileStream * stream = LVFileStream::CreateFileStream( pathname, mode ); if ( stream!=NULL ) diff -Naur -x build -x .git trunk/tinydict/tinydict.cpp vendor\current\crengine/tinydict/tinydict.cpp --- trunk/tinydict/tinydict.cpp 2012-09-13 16:36:54.000000000 +0200 +++ vendor\current\crengine/tinydict/tinydict.cpp 2012-09-13 14:14:36.000000000 +0200 @@ -994,7 +994,7 @@ } } } -#ifdef _WIN32 || defined(_OS2) +#ifdef _WIN32 printf("Press any key..."); getchar(); #endif