Changeset 91


Ignore:
Timestamp:
Jul 28, 2009, 1:52:18 PM (11 years ago)
Author:
Dmitry A. Kuminov
Message:

configure.cmd: Added QT_NO_TABLET, QT_NO_SESSIONMANAGER. Maintain two QT_BUILD_KEY defines in qconfig.h differentiated by the DEBUG #ifdef (for the sake of the debug-and-release build), as on Windows.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.cmd

    r70 r91  
    4141
    4242G.CFG_DEV           = "no"
     43
     44/* All defines that express the limited functionality of the OS/2 version of Qt
     45 * (mostly because the relevant features are not yet implemented) */
     46G.LIMITATION_DEFS   =,
     47    "QT_NO_TABLET QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY",
     48    "QT_NO_SESSIONMANAGER"
    4349
    4450
     
    302308    G.CFG_PREFIX_INSTALL = "yes"
    303309    G.CFG_SDK = ""
    304     /* @todo until the relevant classes are implemented */
    305     G.D_FLAGS = "QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY"
     310    G.D_FLAGS = G.LIMITATION_DEFS
    306311    G.I_FLAGS = ""
    307312    G.L_FLAGS = ""
     
    10881093        end
    10891094        else if (opt == "debug" | opt == "release") then do
    1090             /* the debug build is binary incompatible with the release build */
    1091             BUILD_CONFIG2 = Join(BUILD_CONFIG2, opt)
     1095            /* the debug build is binary incompatible with the release build,
     1096             * but a separate build key is maintained for each, so skip it now */
     1097             nop
    10921098        end
    10931099        else if (opt == "stl") then do
     
    11521158
    11531159    parse value G.PLATFORM with ."-"COMPILER
    1154     QT_BUILD_KEY = G.CFG_USER_BUILD_KEY G.CFG_ARCH COMPILER BUILD_OPTIONS
     1160    QT_BUILD_KEY_PRE = G.CFG_USER_BUILD_KEY G.CFG_ARCH COMPILER
     1161    QT_BUILD_KEY_POST = BUILD_OPTIONS
    11551162    if (G.QT_NAMESPACE \== "") then
    1156         QT_BUILD_KEY = Join(QT_BUILD_KEY, G.QT_NAMESPACE)
    1157 
    1158     QT_BUILD_KEY = Normalize(QT_BUILD_KEY)
     1163        QT_BUILD_KEY_POST = Join(QT_BUILD_KEY_POST, G.QT_NAMESPACE)
     1164
     1165    /* we maintain two separate build keys (mainly necessary for the
     1166     * debug-and-release build) differentiated by the DEBUG compier define */
     1167    QT_BUILD_KEY_RELEASE = Normalize(QT_BUILD_KEY_PRE "release" QT_BUILD_KEY_POST)
     1168    QT_BUILD_KEY_DEBUG = Normalize(QT_BUILD_KEY_PRE "debug" QT_BUILD_KEY_POST)
     1169
     1170    drop QT_BUILD_KEY_PRE QT_BUILD_KEY_POST
    11591171
    11601172    /*--------------------------------------------------------------------------
     
    11901202'#endif'G.EOL||,
    11911203''G.EOL||,
    1192 '#define QT_BUILD_KEY "'QT_BUILD_KEY'"'G.EOL||,
     1204'#if defined(DEBUG) || defined(_DEBUG)'G.EOL||,
     1205'# define QT_BUILD_KEY "'QT_BUILD_KEY_DEBUG'"'G.EOL||,
     1206'#else'G.EOL||,
     1207'# define QT_BUILD_KEY "'QT_BUILD_KEY_RELEASE'"'G.EOL||,
     1208'#endif'G.EOL||,
    11931209''G.EOL||,
    11941210'/* Machine byte-order */'G.EOL||,
Note: See TracChangeset for help on using the changeset viewer.