Changeset 298

Show
Ignore:
Timestamp:
07/10/08 02:24:06 (2 months ago)
Author:
mattn
Message:

* gametools => gametools_win32, gametools_linux, gametools_macos

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • GtkRadiant/trunk/radiant/preferences.cpp

    r297 r298  
    696696 
    697697#if defined(WIN32) 
     698#define TOOLS_ATTRIBUTE "gametools_win32" 
    698699#define ENGINE_ATTRIBUTE "engine_win32" 
     700#define ENGINEPATH_ATTRIBUTE "enginepath_win32" 
    699701#define MP_ENGINE_ATTRIBUTE "mp_engine_win32" 
    700702#elif defined(__linux__) || defined (__FreeBSD__) 
     703#define TOOLS_ATTRIBUTE "gametools_linux" 
    701704#define ENGINE_ATTRIBUTE "engine_linux" 
     705#define ENGINEPATH_ATTRIBUTE "enginepath_linux" 
    702706#define MP_ENGINE_ATTRIBUTE "mp_engine_linux" 
    703707#elif defined(__APPLE__) 
     708#define TOOLS_ATTRIBUTE "gametools_macos" 
    704709#define ENGINE_ATTRIBUTE "engine_macos" 
     710#define ENGINEPATH_ATTRIBUTE "enginepath_macos" 
    705711#define MP_ENGINE_ATTRIBUTE "mp_engine_macos" 
    706712#else 
    …… 
    708714#endif 
    709715 
    710  
    711 #if defined(WIN32) 
    712 #define ENGINEPATH_ATTRIBUTE "enginepath_win32" 
    713 #elif defined(__linux__) || defined (__FreeBSD__) 
    714 #define ENGINEPATH_ATTRIBUTE "enginepath_linux" 
    715 #elif defined(__APPLE__) 
    716 #define ENGINEPATH_ATTRIBUTE "enginepath_macos" 
    717 #else 
    718 #error "unknown platform" 
    719 #endif 
    720  
    721  
    722716CGameDescription::CGameDescription(xmlDocPtr pDoc, const Str &GameFile) 
    723717{ 
    …… 
    734728  } 
    735729  // on win32, game tools path can now be specified relative to the exe's cwd 
    736   prop = (char*)xmlGetProp( pNode, (xmlChar*)"gametools" ); 
     730  prop = (char*)xmlGetProp( pNode, (xmlChar*)TOOLS_ATTRIBUTE); 
    737731  if ( prop == NULL ) { 
    738         Error( "Didn't find 'gametools' node in the game description file '%s'\n", pDoc->URL ); 
     732        Error( "Didn't find '"TOOLS_ATTRIBUTE"' node in the game description file '%s'\n", pDoc->URL ); 
    739733  } 
    740734  { 
    …… 
    33763370        switch ( m_availGames[ m_nComboSelect ] ) { 
    33773371        case GAME_Q2: { 
    3378                 fprintf( fg, "  gametools=\"%sinstalls/Quake2Pack/game\"\n", g_strAppPath.GetBuffer() ); 
     3372                fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/Quake2Pack/game\"\n", g_strAppPath.GetBuffer() ); 
    33793373                fprintf( fg, "  prefix=\".quake2\"\n" ); 
    33803374                Str source = g_strAppPath.GetBuffer(); 
    …… 
    33883382        } 
    33893383        case GAME_Q3: { 
    3390                 fprintf( fg, "  gametools=\"%sinstalls/Q3Pack/game\"\n", g_strAppPath.GetBuffer() ); 
     3384                fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/Q3Pack/game\"\n", g_strAppPath.GetBuffer() ); 
    33913385                fprintf( fg, "  prefix=\".q3a\"\n" ); 
    33923386                Str source = g_strAppPath.GetBuffer(); 
    …… 
    34003394        } 
    34013395        case GAME_URT: { 
    3402                 fprintf( fg, "  gametools=\"%sinstalls/UrTPack/game\"\n", g_strAppPath.GetBuffer() ); 
     3396                fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/UrTPack/game\"\n", g_strAppPath.GetBuffer() ); 
    34033397                fprintf( fg, "  prefix=\".q3a\"\n" ); 
    34043398                Str source = g_strAppPath.GetBuffer(); 
    …… 
    34123406        } 
    34133407        case GAME_UFOAI: { 
    3414                 fprintf( fg, "  gametools=\"%sinstalls/UFOAIPack/game\"\n", g_strAppPath.GetBuffer() ); 
     3408                fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/UFOAIPack/game\"\n", g_strAppPath.GetBuffer() ); 
    34153409                fprintf( fg, "  prefix=\".ufoai\"\n" ); 
    34163410                Str source = g_strAppPath.GetBuffer(); 
    …… 
    34243418        } 
    34253419        case GAME_Q2W: { 
    3426                 fprintf( fg, "  gametools=\"%sinstalls/Q2WPack/game\"\n", g_strAppPath.GetBuffer() ); 
     3420                fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/Q2WPack/game\"\n", g_strAppPath.GetBuffer() ); 
    34273421                fprintf( fg, "  prefix=\".quake2world\"\n" ); 
    34283422                Str source = g_strAppPath.GetBuffer(); 
    …… 
    34363430        } 
    34373431        case GAME_WARSOW: { 
    3438                 fprintf( fg, "  gametools=\"%sinstalls/WarsowPack/game\"\n", g_strAppPath.GetBuffer() ); 
     3432                fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/WarsowPack/game\"\n", g_strAppPath.GetBuffer() ); 
    34393433                fprintf( fg, "  prefix=\".warsow\"\n" ); 
    34403434                Str source = g_strAppPath.GetBuffer(); 
    …… 
    34483442        } 
    34493443        case GAME_NEXUIZ: { 
    3450                 fprintf( fg, "  gametools=\"%sinstalls/NexuizPack/game\"\n", g_strAppPath.GetBuffer() ); 
     3444                fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/NexuizPack/game\"\n", g_strAppPath.GetBuffer() ); 
    34513445                fprintf( fg, "  prefix=\".nexuiz\"\n" ); 
    34523446                Str source = g_strAppPath.GetBuffer(); 
    …… 
    34603454        } 
    34613455        case GAME_TREMULOUS: { 
    3462                 fprintf( fg, "  gametools=\"%sinstalls/TremulousPack/game\"\n", g_strAppPath.GetBuffer() ); 
     3456                fprintf( fg, "  "TOOLS_ATTRIBUTE"=\"%sinstalls/TremulousPack/game\"\n", g_strAppPath.GetBuffer() ); 
    34633457                fprintf( fg, "  prefix=\".tremulous\"\n" ); 
    34643458                Str source = g_strAppPath.GetBuffer();