source: diffs/CoolReader_3.0.55.diff@ 156

Last change on this file since 156 was 145, checked in by Silvan Scherrer, 12 years ago

Qtapps: added more diffs

File size: 9.2 KB
  • .gitignore

    diff -Naur -x build -x .git trunk/.gitignore vendor\current\crengine/.gitignore
    old new  
     1*.*~
     2qtbuild
     3v3build
     4v5build
     5wxbuild
     6qtbuild
     7qt-build
     8qtcreator-build
     9*~
  • CMakeLists.txt

    diff -Naur -x build -x .git trunk/CMakeLists.txt vendor\current\crengine/CMakeLists.txt
    old new  
    9797  ADD_DEFINITIONS( -DMAC=1 -DLINUX=1 -D_LINUX=1 -DCR_EMULATE_GETTEXT=1 )
    9898elseif ( WIN32 )
    9999  ADD_DEFINITIONS( -DWIN32=1 -D_WIN32=1 -DCR_EMULATE_GETTEXT=1 )
    100 elseif ( OS2 )
    101   ADD_DEFINITIONS( -DOS2=1 -D_OS2=1 )
    102100else()
    103101  ADD_DEFINITIONS( -DLINUX=1 -D_LINUX=1 )
    104102endif(MAC)
  • cr3qt/CMakeLists.txt

    diff -Naur -x build -x .git trunk/cr3qt/CMakeLists.txt vendor\current\crengine/cr3qt/CMakeLists.txt
    old new  
    4848    ADD_DEFINITIONS(-DCR3_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/cr3/"
    4949          -DUSE_FONTCONFIG=1
    5050    )
    51 ELSEIF (OS2)
    52     ADD_DEFINITIONS(-DCR3_DATA_DIR=""
    53           -DUSE_FONTCONFIG=1
    54     )
    5551ELSE()
    5652    ADD_DEFINITIONS(-DCR3_DATA_DIR=""
    5753          -DUSE_FONTCONFIG=0
     
    7571  endif(MINGW)
    7672ENDIF (WIN32)
    7773
    78 IF (OS2)
    79  # init of the rc compiler
    80  set(RES_FILES "src/cr3_os2.rc")
    81  ENABLE_LANGUAGE(RC)
    82  set(CMAKE_RC_COMPILER_INIT rc)
    83     SET(CMAKE_RC_COMPILE_OBJECT
    84       "<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)
    8874
    8975SET(LANGUAGES ru uk cs de es pl bg hu)
    9076message( "Languages: ${LANGUAGES}" )
     
    172158#${QT_LIBRARIES}
    173159ELSEIF (UNIX)
    174160    SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
    175 ELSEIF (OS2)
    176     SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} fontconfig xml2 mmap)
    177161ELSE()
    178162    SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES})
    179163ENDIF(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ÿmU’UU’Uª’Uÿ’U¶UU¶Uª¶Uÿ¶UÛUUÛUªÛUÿÛUÿUUÿUªÿUÿÿUUU€U$ÿ€$€U$€ª$€ÿ$€I€UI€ªI€ÿI€m€Um€ª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ÿU’UU¶¶UÿUÛUUÿÿUÿU€€$$€ÿUI€€m''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ƒ
    †ŠŠ‡
    öÿÿ||xŠ‹ŒŒŒ‹Šy|ty}zypy{||øø÷÷‡ŠŠŒ~ÿÿÿz‡‹Œ‹ŽŒ‡ywwruxq{~~÷†Š‹‹‡ÿÿö{x‹Ž‹ŒŽŒŽ‹
    ƒøurwrsr~†ƒ
    †ŠŒŒ‹ÿÿÿ‡Œ‹Œ‹öŽŒ‹†÷‚}~uuvvqqtxø‚‹ŒŒŽ‚ÿÿÿƒŒŽ‹‹ŒŽŽŒŽŠŒ†÷øøtwwyw|rqyzyyxz÷Š
    Žÿÿö
    ŒŒŒŒŒöŽŒŒŒŠŠ‚}uxwzzz~øwyy‹{ƒ‡†
    †ÿÿ÷ŒŽŽÿÿÿÿÿÿÿÿÿÿŒxvzz|~øŒÿ‡
    †
    ‹‡öÿö÷‹ÿ‡uÿ~ƒÿøÿƒ~ÿ‹ÿÿÿÿЇ‹Žqw‡ÿ~ƒÿpŠ‹ÿÿÿÿÿ‹Œöqpvy|}q~ÿƒÿwЇ‡ÿÿÿÿÿÿÿŽÿyø|yuxxv†qz
    qvö
    ÷ÿÿÿÿÿÿÿÿÿÿއ{uøywz|wŽrÿ÷öÿÿÿÿÿÿÿÿÿÿ
    ÷Œ‚ø|xv†ÿ}|z}~~øŠÿÿ
    ÿÿÿÿÿÿÿÿÿÿÿÿöÿƒ|tøöÿÿöŽ|øøƒƒxpq‹ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿø~y÷Œÿÿÿÿÿƒ
    
    ƒqquŽÿÿÿÿÿÿÿÿÿÿÿÿÿpÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ‹öÿÿszÿÿÿÿÿÿÿÿÿÿÿvÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿørŽÿÿÿÿÿÿÿÿÿÿÿÿÿÿ}ÿÿÿÿÿÿÿŽ~ÿÿÿÿÿÿÿÿÿÿvÿÿuƒÿÿÿÿÿÿÿÿÿÿÿŠvŒÿÿÿÿ÷pöÿÿÿs~ÿÿÿ}~ÿrrÿÿÿÿÿÿÿÿÿÿÿ‡~
    ÷y†ÿÿÿ‡uŒpsŽÿÿÿÿÿÿÿÿÿÿÿÿ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  
    156156            QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/Contents/Resources/"); //QDir::separator();
    157157            QString translations = exeDir + "i18n";
    158158#else
    159 #if defined(_WIN32) || defined(Q_OS_OS2)
     159#if defined(_WIN32)
    160160            QString exeDir = QDir::toNativeSeparators(qApp->applicationDirPath() + "/"); //QDir::separator();
    161161            QString translations = exeDir + "i18n";
    162162#else
     
    308308bool InitCREngine( const char * exename, lString16Collection & fontDirs )
    309309{
    310310        CRLog::trace("InitCREngine(%s)", exename);
    311 #if defined(_WIN32) || defined(Q_OS_OS2)
     311#ifdef _WIN32
    312312    lString16 appname( exename );
    313313    int lastSlash=-1;
    314314    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  
    4848#define FILE_STREAM_BUFFER_SIZE              0x40000
    4949#endif
    5050
    51 #elif defined(_LINUX) || defined (LINUX) || defined(_OS2) || defined (OS2)
     51#elif defined(_LINUX) || defined (LINUX)
    5252
    5353#ifndef LDOM_USE_OWN_MEM_MAN
    5454#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  
    5454#include <sys/mman.h>
    5555#endif
    5656
    57 #if defined(_LINUX) || defined(_OS2)
     57#ifdef _LINUX
    5858#include <sys/types.h>
    5959#include <sys/stat.h>
    6060#include <unistd.h>
     
    302302
    303303
    304304//#if USE__FILES==1
    305 #if defined(_LINUX) || defined(_WIN32) || defined(_OS2)
     305#if defined(_LINUX) || defined(_WIN32)
    306306
    307307class LVFileMappedStream : public LVNamedStream
    308308{
     
    828828
    829829
    830830//#ifdef _LINUX
    831 #ifndef _OS2
    832831#undef USE_ANSI_FILES
    833 #endif
    834832//#endif
    835833
    836834#if (USE_ANSI_FILES==1)
     
    35193517    lChar16 c = pathName[0];
    35203518    if ( c=='\\' || c=='/' )
    35213519        return true;
    3522 #if defined(_WIN32) || defined(_OS2)
     3520#ifdef _WIN32
    35233521    if ( (c>='a' && c<='z') || (c>='A' && c<='Z') ) {
    35243522        return (pathName[1]==':');
    35253523    }
     
    37623760*/
    37633761LVStreamRef LVMapFileStream( const lChar16 * pathname, lvopen_mode_t mode, lvsize_t minSize )
    37643762{
    3765 #if !defined(_WIN32) && !defined(_LINUX) && !defined(_OS2)
     3763#if !defined(_WIN32) && !defined(_LINUX)
    37663764        // STUB for systems w/o mmap
    37673765    LVFileStream * stream = LVFileStream::CreateFileStream( pathname, mode );
    37683766    if ( stream!=NULL )
  • tinydict/tinydict.cpp

    diff -Naur -x build -x .git trunk/tinydict/tinydict.cpp vendor\current\crengine/tinydict/tinydict.cpp
    old new  
    994994                        }
    995995                }
    996996        }
    997 #ifdef _WIN32 || defined(_OS2)
     997#ifdef _WIN32
    998998        printf("Press any key...");
    999999        getchar();
    10001000#endif
Note: See TracBrowser for help on using the repository browser.