From 9de64efa623aeab9472b1c13971165f997303ff2 Mon Sep 17 00:00:00 2001 From: dhewg Date: Sat, 14 Jan 2012 18:38:44 +0100 Subject: [PATCH] This is dhewm 3 Rename project, now at https://github.com/dhewm --- CMakeLists.txt | 32 ++++++++++++++++---------------- d3xp/gamesys/SysCvar.cpp | 2 +- framework/Licensee.h | 12 ++++++------ game/gamesys/SysCvar.cpp | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03eaead..2793b6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -project(doom3) +project(dhewm3) cmake_minimum_required(VERSION 2.6) # TODO @@ -68,17 +68,17 @@ if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "RelWithDebInfo") endif() -# precompiled libraries from the doom3-libs repo -if (DOOM3LIBS) +# precompiled libraries from the dhewm3-libs repo +if (DHEWM3LIBS) if (CMAKE_CROSSCOMPILING) - set(CMAKE_FIND_ROOT_PATH ${DOOM3LIBS}) + set(CMAKE_FIND_ROOT_PATH ${DHEWM3LIBS}) else() - set(ENV{CMAKE_PREFIX_PATH} ${DOOM3LIBS}) + set(ENV{CMAKE_PREFIX_PATH} ${DHEWM3LIBS}) endif() # these are too stupid, give them a hint - set(ENV{OPENALDIR} ${DOOM3LIBS}) - set(ENV{SDLDIR} ${DOOM3LIBS}) + set(ENV{OPENALDIR} ${DHEWM3LIBS}) + set(ENV{SDLDIR} ${DHEWM3LIBS}) endif() # libs @@ -706,17 +706,17 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT MING endif() if (CORE) - add_executable(doom3 WIN32 MACOSX_BUNDLE + add_executable(dhewm3 WIN32 MACOSX_BUNDLE ${src_core} ${src_sys_base} ${src_sys_core} ) - set_target_properties(doom3 PROPERTIES COMPILE_DEFINITIONS "__DOOM_DLL__") - set_target_properties(doom3 PROPERTIES LINK_FLAGS "${ldflags}") - set_target_properties(doom3 PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/sys/osx/Info.plist) + set_target_properties(dhewm3 PROPERTIES COMPILE_DEFINITIONS "__DOOM_DLL__") + set_target_properties(dhewm3 PROPERTIES LINK_FLAGS "${ldflags}") + set_target_properties(dhewm3 PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/sys/osx/Info.plist) - target_link_libraries(doom3 + target_link_libraries(dhewm3 idlib ${OPENGL_gl_LIBRARY} ${OPENAL_LIBRARY} @@ -731,7 +731,7 @@ if (CORE) endif() if (DEDICATED) - add_executable(doom3ded WIN32 MACOSX_BUNDLE + add_executable(dhewm3ded WIN32 MACOSX_BUNDLE ${src_core} ${src_stub_openal} ${src_stub_gl} @@ -740,9 +740,9 @@ if (DEDICATED) ${src_sys_dedicated} ) - set_target_properties(doom3ded PROPERTIES COMPILE_DEFINITIONS "ID_DEDICATED;__DOOM_DLL__") - set_target_properties(doom3ded PROPERTIES LINK_FLAGS "${ldflags}") - target_link_libraries(doom3ded + set_target_properties(dhewm3ded PROPERTIES COMPILE_DEFINITIONS "ID_DEDICATED;__DOOM_DLL__") + set_target_properties(dhewm3ded PROPERTIES LINK_FLAGS "${ldflags}") + target_link_libraries(dhewm3ded idlib ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} diff --git a/d3xp/gamesys/SysCvar.cpp b/d3xp/gamesys/SysCvar.cpp index 49dd7ce..73ca491 100644 --- a/d3xp/gamesys/SysCvar.cpp +++ b/d3xp/gamesys/SysCvar.cpp @@ -76,7 +76,7 @@ idCVar gamename( "gamename", GAME_VERSION, CVAR_GAME | CVAR_SERVERINFO | idCVar gamedate( "gamedate", __DATE__, CVAR_GAME | CVAR_ROM, "" ); // server info -idCVar si_name( "si_name", "DOOM Server", CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "name of the server" ); +idCVar si_name( "si_name", "dhewm server", CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "name of the server" ); #ifdef CTF idCVar si_gameType( "si_gameType", si_gameTypeArgs[ 0 ], CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "game type - singleplayer, deathmatch, Tourney, Team DM, Last Man or CTF", si_gameTypeArgs, idCmdSystem::ArgCompletion_String ); diff --git a/framework/Licensee.h b/framework/Licensee.h index bb67bb8..fe15c76 100644 --- a/framework/Licensee.h +++ b/framework/Licensee.h @@ -34,9 +34,9 @@ If you have questions concerning this license or the applicable additional terms =============================================================================== */ -#define GAME_NAME "DOOM 3" // appears on window titles and errors +#define GAME_NAME "dhewm 3" // appears on window titles and errors -#define ENGINE_VERSION "DOOM 1.3.1" // printed in console +#define ENGINE_VERSION "dhewm 1.3.1" // printed in console // paths #ifdef ID_DEMO_BUILD @@ -46,7 +46,7 @@ If you have questions concerning this license or the applicable additional terms #endif // filenames -#define CONFIG_FILE "DoomConfig.cfg" +#define CONFIG_FILE "dhewm.cfg" // base folder where the source code lives #define SOURCE_CODE_BASE_FOLDER "neo" @@ -91,13 +91,13 @@ If you have questions concerning this license or the applicable additional terms #define EDITOR_WINDOWTEXT "DOOMEdit" // win32 info -#define WIN32_CONSOLE_CLASS "DOOM 3 WinConsole" +#define WIN32_CONSOLE_CLASS "dhewm 3 WinConsole" // Linux info #ifdef ID_DEMO_BUILD - #define LINUX_DEFAULT_PATH "/usr/local/games/doom3-demo" + #define LINUX_DEFAULT_PATH "/usr/local/games/dhewm3-demo" #else - #define LINUX_DEFAULT_PATH "/usr/local/games/doom3" + #define LINUX_DEFAULT_PATH "/usr/local/games/dhewm3" #endif // CD Key file info diff --git a/game/gamesys/SysCvar.cpp b/game/gamesys/SysCvar.cpp index 745e14d..5710276 100644 --- a/game/gamesys/SysCvar.cpp +++ b/game/gamesys/SysCvar.cpp @@ -66,7 +66,7 @@ idCVar gamename( "gamename", GAME_VERSION, CVAR_GAME | CVAR_SERVERINFO | idCVar gamedate( "gamedate", __DATE__, CVAR_GAME | CVAR_ROM, "" ); // server info -idCVar si_name( "si_name", "DOOM Server", CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "name of the server" ); +idCVar si_name( "si_name", "dhewm server", CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "name of the server" ); idCVar si_gameType( "si_gameType", si_gameTypeArgs[ 0 ], CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "game type - singleplayer, deathmatch, Tourney, Team DM or Last Man", si_gameTypeArgs, idCmdSystem::ArgCompletion_String ); idCVar si_map( "si_map", "game/mp/d3dm1",CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "map to be played next on server", idCmdSystem::ArgCompletion_MapName ); idCVar si_maxPlayers( "si_maxPlayers", "4", CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_INTEGER, "max number of players allowed on the server", 1, 4 );