dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-24 05:21:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

This is dhewm 3

Browse source 
Rename project, now at https://github.com/dhewm
This commit is contained in:
dhewg 2012-01-14 18:38:44 +01:00 committed by Daniel Gibson
parent 5b49b7242b
commit 9de64efa62
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
CMakeLists.txt
View file

@ -1,4 +1,4 @@
project(doom3) project(dhewm3)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
# TODO # TODO
@ -68,17 +68,17 @@ if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo") set(CMAKE_BUILD_TYPE "RelWithDebInfo")
endif() endif()
# precompiled libraries from the doom3-libs repo # precompiled libraries from the dhewm3-libs repo
if (DOOM3LIBS) if (DHEWM3LIBS)
if (CMAKE_CROSSCOMPILING) if (CMAKE_CROSSCOMPILING)
set(CMAKE_FIND_ROOT_PATH ${DOOM3LIBS}) set(CMAKE_FIND_ROOT_PATH ${DHEWM3LIBS})
else() else()
set(ENV{CMAKE_PREFIX_PATH} ${DOOM3LIBS}) set(ENV{CMAKE_PREFIX_PATH} ${DHEWM3LIBS})
endif() endif()
# these are too stupid, give them a hint # these are too stupid, give them a hint
set(ENV{OPENALDIR} ${DOOM3LIBS}) set(ENV{OPENALDIR} ${DHEWM3LIBS})
set(ENV{SDLDIR} ${DOOM3LIBS}) set(ENV{SDLDIR} ${DHEWM3LIBS})
endif() endif()
# libs # libs
@ -706,17 +706,17 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT MING
endif() endif()
if (CORE) if (CORE)
add_executable(doom3 WIN32 MACOSX_BUNDLE add_executable(dhewm3 WIN32 MACOSX_BUNDLE
${src_core} ${src_core}
${src_sys_base} ${src_sys_base}
${src_sys_core} ${src_sys_core}
) )
set_target_properties(doom3 PROPERTIES COMPILE_DEFINITIONS "__DOOM_DLL__") set_target_properties(dhewm3 PROPERTIES COMPILE_DEFINITIONS "__DOOM_DLL__")
set_target_properties(doom3 PROPERTIES LINK_FLAGS "${ldflags}") set_target_properties(dhewm3 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 MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/sys/osx/Info.plist)
target_link_libraries(doom3 target_link_libraries(dhewm3
idlib idlib
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${OPENAL_LIBRARY} ${OPENAL_LIBRARY}
@ -731,7 +731,7 @@ if (CORE)
endif() endif()
if (DEDICATED) if (DEDICATED)
add_executable(doom3ded WIN32 MACOSX_BUNDLE add_executable(dhewm3ded WIN32 MACOSX_BUNDLE
${src_core} ${src_core}
${src_stub_openal} ${src_stub_openal}
${src_stub_gl} ${src_stub_gl}
@ -740,9 +740,9 @@ if (DEDICATED)
${src_sys_dedicated} ${src_sys_dedicated}
) )
set_target_properties(doom3ded PROPERTIES COMPILE_DEFINITIONS "ID_DEDICATED;__DOOM_DLL__") set_target_properties(dhewm3ded PROPERTIES COMPILE_DEFINITIONS "ID_DEDICATED;__DOOM_DLL__")
set_target_properties(doom3ded PROPERTIES LINK_FLAGS "${ldflags}") set_target_properties(dhewm3ded PROPERTIES LINK_FLAGS "${ldflags}")
target_link_libraries(doom3ded target_link_libraries(dhewm3ded
idlib idlib
${VORBISFILE_LIBRARIES} ${VORBISFILE_LIBRARIES}
${VORBIS_LIBRARIES} ${VORBIS_LIBRARIES}

2
d3xp/gamesys/SysCvar.cpp
View file

@ -76,7 +76,7 @@ idCVar gamename( "gamename", GAME_VERSION, CVAR_GAME | CVAR_SERVERINFO |
idCVar gamedate( "gamedate", __DATE__, CVAR_GAME | CVAR_ROM, "" ); idCVar gamedate( "gamedate", __DATE__, CVAR_GAME | CVAR_ROM, "" );
// server info // 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 #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<si_gameTypeArgs> ); 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<si_gameTypeArgs> );

12
framework/Licensee.h
View file

@ -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 // paths
#ifdef ID_DEMO_BUILD #ifdef ID_DEMO_BUILD
@ -46,7 +46,7 @@ If you have questions concerning this license or the applicable additional terms
#endif #endif
// filenames // filenames
#define CONFIG_FILE "DoomConfig.cfg" #define CONFIG_FILE "dhewm.cfg"
// base folder where the source code lives // base folder where the source code lives
#define SOURCE_CODE_BASE_FOLDER "neo" #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" #define EDITOR_WINDOWTEXT "DOOMEdit"
// win32 info // win32 info
#define WIN32_CONSOLE_CLASS "DOOM 3 WinConsole" #define WIN32_CONSOLE_CLASS "dhewm 3 WinConsole"
// Linux info // Linux info
#ifdef ID_DEMO_BUILD #ifdef ID_DEMO_BUILD
#define LINUX_DEFAULT_PATH "/usr/local/games/doom3-demo" #define LINUX_DEFAULT_PATH "/usr/local/games/dhewm3-demo"
#else #else
#define LINUX_DEFAULT_PATH "/usr/local/games/doom3" #define LINUX_DEFAULT_PATH "/usr/local/games/dhewm3"
#endif #endif
// CD Key file info // CD Key file info

2
game/gamesys/SysCvar.cpp
View file

@ -66,7 +66,7 @@ idCVar gamename( "gamename", GAME_VERSION, CVAR_GAME | CVAR_SERVERINFO |
idCVar gamedate( "gamedate", __DATE__, CVAR_GAME | CVAR_ROM, "" ); idCVar gamedate( "gamedate", __DATE__, CVAR_GAME | CVAR_ROM, "" );
// server info // 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<si_gameTypeArgs> ); 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<si_gameTypeArgs> );
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_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 ); idCVar si_maxPlayers( "si_maxPlayers", "4", CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_INTEGER, "max number of players allowed on the server", 1, 4 );