source:
diffs/CoolReader_3.0.55.diff@
156
Last change on this file since 156 was 145, checked in by , 12 years ago | |
---|---|
File size: 9.2 KB |
-
.gitignore
diff -Naur -x build -x .git trunk/.gitignore vendor\current\crengine/.gitignore
old new 1 *.*~ 2 qtbuild 3 v3build 4 v5build 5 wxbuild 6 qtbuild 7 qt-build 8 qtcreator-build 9 *~ -
CMakeLists.txt
diff -Naur -x build -x .git trunk/CMakeLists.txt vendor\current\crengine/CMakeLists.txt
old new 97 97 ADD_DEFINITIONS( -DMAC=1 -DLINUX=1 -D_LINUX=1 -DCR_EMULATE_GETTEXT=1 ) 98 98 elseif ( WIN32 ) 99 99 ADD_DEFINITIONS( -DWIN32=1 -D_WIN32=1 -DCR_EMULATE_GETTEXT=1 ) 100 elseif ( OS2 )101 ADD_DEFINITIONS( -DOS2=1 -D_OS2=1 )102 100 else() 103 101 ADD_DEFINITIONS( -DLINUX=1 -D_LINUX=1 ) 104 102 endif(MAC) -
cr3qt/CMakeLists.txt
diff -Naur -x build -x .git trunk/cr3qt/CMakeLists.txt vendor\current\crengine/cr3qt/CMakeLists.txt
old new 48 48 ADD_DEFINITIONS(-DCR3_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/cr3/" 49 49 -DUSE_FONTCONFIG=1 50 50 ) 51 ELSEIF (OS2)52 ADD_DEFINITIONS(-DCR3_DATA_DIR=""53 -DUSE_FONTCONFIG=154 )55 51 ELSE() 56 52 ADD_DEFINITIONS(-DCR3_DATA_DIR="" 57 53 -DUSE_FONTCONFIG=0 … … 75 71 endif(MINGW) 76 72 ENDIF (WIN32) 77 73 78 IF (OS2)79 # init of the rc compiler80 set(RES_FILES "src/cr3_os2.rc")81 ENABLE_LANGUAGE(RC)82 set(CMAKE_RC_COMPILER_INIT rc)83 SET(CMAKE_RC_COMPILE_OBJECT84 "<CMAKE_RC_COMPILER> -n -r -i ${CMAKE_CURRENT_SOURCE_DIR}/src <SOURCE> <OBJECT>")85 86 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zstack 0x2000 -Zlinker \"DISABLE 1121\" -s -Zlinker /PM:PM -Zno-fork -Zhigh-mem -Zmap")87 ENDIF (OS2)88 74 89 75 SET(LANGUAGES ru uk cs de es pl bg hu) 90 76 message( "Languages: ${LANGUAGES}" ) … … 172 158 #${QT_LIBRARIES} 173 159 ELSEIF (UNIX) 174 160 SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} ) 175 ELSEIF (OS2)176 SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} fontconfig xml2 mmap)177 161 ELSE() 178 162 SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES}) 179 163 ENDIF(MAC) -
cr3qt/src/cr3_os2.rc
diff -Naur -x build -x .git trunk/cr3qt/src/cr3_os2.rc vendor\current\crengine/cr3qt/src/cr3_os2.rc
old new 1 ICON 1 DISCARDABLE "icons/cr3_os2.ico"2 No newline at end of file -
cr3qt/src/icons/cr3_os2.ico
diff -Naur -x build -x .git trunk/cr3qt/src/icons/cr3_os2.ico vendor\current\crengine/cr3qt/src/icons/cr3_os2.ico
old new 1 CI" -
cr3qt/src/main.cpp
: (PÿÿÿCI" º ((ªªÁÁÁÌÌÌÿÛªªIÿImUmªmÿm$Uª$ÿ¶U¶ª¶ÿ¶ÛUÛªÛÿÛªÛÿUÿªÿªÿÿ+U+ª+ÿ+$+U$+ª$+ÿ$+I+UI+ªI+ÿI+m+Um+ªm+ÿm++U+ª+ÿ+¶+U¶+ª¶+ÿ¶+Û+UÛ+ªÛ+ÿÛ+ÿ+Uÿ+ªÿ+ÿÿ+UUUªUÿU$UU$Uª$Uÿ$UIUUIUªIUÿIUmUUmUªmUÿmUUUUªUÿU¶UU¶Uª¶Uÿ¶UÛUUÛUªÛUÿÛUÿUUÿUªÿUÿÿUUUU$ÿ$U$ª$ÿ$IUIªIÿImUmªmÿm'''...666>>>FFFMMMUUU]]]dddlllttt|||Ûÿÿ¶ÿªªª²²²¹¹¹ÿ$IÑÑÑØØØàààèèèðððª¶ÿÿÛÿUªÿ¶U¶ª¶ÿ¶ÛUÛªÛÿÛÿUÿªÿÿÿªUªªªÿª$ªU$ªª$ªÿ$ªIªUIªªIªÿIªmªUmªªmªÿmªªUªªªÿª¶ªU¶ªª¶ªÿ¶ªÛªUÛªªÛªUIÿªUÿªªÿªÿÿªÕUÕªÕÿÕ$ÕU$Õª$Õÿ$ÕIÕUIÕªIÕÿIÕmÕUmÕªmÕÿmÕÕUÕªÕÿÕ¶ÕU¶Õª¶Õÿ¶ÕÛÕUÛÕªÛÕÿÛÕÿÕUÿÕªÿÕÿÿÕUÛÿUÿªÿUÿÿ$ÿU$ÿª$ÿÿ$ÿIÿUIÿªIÿÿIÿmÿUmÿªmÿÿmÿÿUÿªÿÿÿ¶ÿU¶ÿ÷÷÷¢¢¢ÿÿÿÿÿÿÿÿÿÿÿÿÁÿÛªmmÿU¶¶ÿUÛªÛÿªU++$$+ÿUI++mm+ÿU++¶¶+ÿUÛ++ÿÿ+ÿUUU$$UÿUIUUmmUÿUUU¶¶UÿUÛUUÿÿUÿU$$ÿUIm''66>MMM]ddtt|ÿ¶²²¹IØààððªU¶¶ÿUÛÿÿÿUªª$$ªÿUIªªmmªÿUªª¶¶ªÿUÛªÿÿªÿUÕÕ$$ÕÿUIÕÕmmÕÿUÕÕ¶¶Õÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷}ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöÿÿÿÿÿÿÿÿÿÿÿÿÿÿööÿÿÿÿÿÿÿÿÿÿÿÿÿÿy÷ÿÿÿÿÿÿÿÿÿÿÿÿÿÿööÿÿÿÿÿÿÿÿÿÿÿÿÿö~÷øöÿÿÿÿÿÿ ÿÿÿöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöz ÷ yÿÿÿÿÿ ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ ÷}}ÿÿ÷z{r öÿÿÿÿÿÿÿÿÿÿÿÿÿz÷~÷ ppuuz{x÷öÿÿÿÿÿÿÿÿÿÿ÷øzz q|ttyyzøy|ÿÿÿÿÿÿÿÿ|~~ø~øzvwv~~}y~~÷÷~|}ÿÿÿz~ z~~|÷{vyxvt|{{~øwøÿÿöø~{x~~{|zpywwy}ø{z öÿÿ||xy|ty}zypy{||øø÷÷~ÿÿÿzywwruxq{~~÷ÿÿö{x øurwrsr~ ÿÿÿö÷}~uuvvqqtxøÿÿÿ÷øøtwwyw|rqyzyyxz÷ ÿÿö ö}uxwzzz~øwyy{ ÿÿ÷ÿÿÿÿÿÿÿÿÿÿxvzz|~øÿ öÿö÷ÿuÿ~ÿøÿ~ÿÿÿÿÿqwÿ~ÿpÿÿÿÿÿöqpvy|}q~ÿÿwÿÿÿÿÿÿÿÿyø|yuxxvqz qvö ÷ÿÿÿÿÿÿÿÿÿÿ{uøywz|wrÿ÷öÿÿÿÿÿÿÿÿÿÿ ÷ø|xvÿ}|z}~~øÿÿ ÿÿÿÿÿÿÿÿÿÿÿÿöÿ|tøöÿÿö|øøxpqÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿø~y÷ÿÿÿÿÿ qquÿÿÿÿÿÿÿÿÿÿÿÿÿpÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöÿÿszÿÿÿÿÿÿÿÿÿÿÿvÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿørÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}ÿÿÿÿÿÿÿ~ÿÿÿÿÿÿÿÿÿÿvÿÿuÿÿÿÿÿÿÿÿÿÿÿvÿÿÿÿ÷pöÿÿÿs~ÿÿÿ}~ÿrrÿÿÿÿÿÿÿÿÿÿÿ~ ÷yÿÿÿupsÿÿÿÿÿÿÿÿÿÿÿÿw~ÿÿÿÿÿzöÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿxrÿÿÿÿÿÿÿÿw|öÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ÷}~ÿÿÿÿÿÿÿÿÿÿ}}ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ \ No newline at end of file diff -Naur -x build -x .git trunk/cr3qt/src/main.cpp vendor\current\crengine/cr3qt/src/main.cpp
old new 156 156 QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/Contents/Resources/"); //QDir::separator(); 157 157 QString translations = exeDir + "i18n"; 158 158 #else 159 #if defined(_WIN32) || defined(Q_OS_OS2)159 #if defined(_WIN32) 160 160 QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/"); //QDir::separator(); 161 161 QString translations = exeDir + "i18n"; 162 162 #else … … 308 308 bool InitCREngine( const char * exename, lString16Collection & fontDirs ) 309 309 { 310 310 CRLog::trace("InitCREngine(%s)", exename); 311 #if defined(_WIN32) || defined(Q_OS_OS2)311 #ifdef _WIN32 312 312 lString16 appname( exename ); 313 313 int lastSlash=-1; 314 314 lChar16 slashChar = '/'; -
crengine/include/crsetup.h
diff -Naur -x build -x .git trunk/crengine/include/crsetup.h vendor\current\crengine/crengine/include/crsetup.h
old new 48 48 #define FILE_STREAM_BUFFER_SIZE 0x40000 49 49 #endif 50 50 51 #elif defined(_LINUX) || defined (LINUX) || defined(_OS2) || defined (OS2)51 #elif defined(_LINUX) || defined (LINUX) 52 52 53 53 #ifndef LDOM_USE_OWN_MEM_MAN 54 54 #define LDOM_USE_OWN_MEM_MAN 1 -
crengine/src/lvstream.cpp
diff -Naur -x build -x .git trunk/crengine/src/lvstream.cpp vendor\current\crengine/crengine/src/lvstream.cpp
old new 54 54 #include <sys/mman.h> 55 55 #endif 56 56 57 #if defined(_LINUX) || defined(_OS2)57 #ifdef _LINUX 58 58 #include <sys/types.h> 59 59 #include <sys/stat.h> 60 60 #include <unistd.h> … … 302 302 303 303 304 304 //#if USE__FILES==1 305 #if defined(_LINUX) || defined(_WIN32) || defined(_OS2)305 #if defined(_LINUX) || defined(_WIN32) 306 306 307 307 class LVFileMappedStream : public LVNamedStream 308 308 { … … 828 828 829 829 830 830 //#ifdef _LINUX 831 #ifndef _OS2832 831 #undef USE_ANSI_FILES 833 #endif834 832 //#endif 835 833 836 834 #if (USE_ANSI_FILES==1) … … 3519 3517 lChar16 c = pathName[0]; 3520 3518 if ( c=='\\' || c=='/' ) 3521 3519 return true; 3522 #if defined(_WIN32) || defined(_OS2)3520 #ifdef _WIN32 3523 3521 if ( (c>='a' && c<='z') || (c>='A' && c<='Z') ) { 3524 3522 return (pathName[1]==':'); 3525 3523 } … … 3762 3760 */ 3763 3761 LVStreamRef LVMapFileStream( const lChar16 * pathname, lvopen_mode_t mode, lvsize_t minSize ) 3764 3762 { 3765 #if !defined(_WIN32) && !defined(_LINUX) && !defined(_OS2)3763 #if !defined(_WIN32) && !defined(_LINUX) 3766 3764 // STUB for systems w/o mmap 3767 3765 LVFileStream * stream = LVFileStream::CreateFileStream( pathname, mode ); 3768 3766 if ( stream!=NULL ) -
tinydict/tinydict.cpp
diff -Naur -x build -x .git trunk/tinydict/tinydict.cpp vendor\current\crengine/tinydict/tinydict.cpp
old new 994 994 } 995 995 } 996 996 } 997 #ifdef _WIN32 || defined(_OS2)997 #ifdef _WIN32 998 998 printf("Press any key..."); 999 999 getchar(); 1000 1000 #endif
Note:
See TracBrowser
for help on using the repository browser.