dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-03-23 19:21:04 +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
parent d472149426
commit 898f690fc4
7 changed files with 41 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
README.txt
View file

@ -1,11 +1,18 @@
Doom 3 GPL source release
=========================
dhewm 3
=======
This file contains the following sections:
ABOUT
GENERAL NOTES
LICENSE
ABOUT
=====
dhewm 3 is a Doom 3 GPL source modification.
GENERAL NOTES
=============
@ -49,7 +56,7 @@ cmake /path/to/repository/neo
Using the provided Windows binaries:
------------------------------------
Get a clone of the latest binaries here: https://github.com/dhewg/doom3-libs
Get a clone of the latest binaries here: https://github.com/dhewm/dhewm3-libs
There are two subfolder:
- 32bit binaries are located in "i686-w64-mingw32"
@ -57,8 +64,8 @@ There are two subfolder:
Issue the appropriate command from the build folder, for example:
cmake -G "Visual Studio 10" -DDOOM3LIBS=/path/to/doom3-libs/i686-w64-mingw32 /path/to/repository/neo
cmake -G "Visual Studio 10 Win64" -DDOOM3LIBS=/path/to/doom3-libs/x86_64-w64-mingw32 /path/to/repository/neo
cmake -G "Visual Studio 10" -DDHEWM3LIBS=/path/to/dhewm3-libs/i686-w64-mingw32 /path/to/repository/neo
cmake -G "Visual Studio 10 Win64" -DDHEWM3LIBS=/path/to/dhewm3-libs/x86_64-w64-mingw32 /path/to/repository/neo
The binaries are compatible with mingw-w64 and all MSVC versions.
@ -84,7 +91,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
< --- cut --- >
Then point CMake at your Toolchain file:
cmake -DCMAKE_TOOLCHAIN_FILE=/path/to/Toolchain.cmake -DDOOM3LIBS=/path/to/doom3-libs/i686-w64-mingw32 /path/to/repository/neo
cmake -DCMAKE_TOOLCHAIN_FILE=/path/to/Toolchain.cmake -DDHEWM3LIBS=/path/to/dhewm3-libs/i686-w64-mingw32 /path/to/repository/neo
Back End Rendering of Stencil Shadows:
--------------------------------------

32
neo/CMakeLists.txt
View file

@ -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}

2
neo/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, "" );
// 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<si_gameTypeArgs> );

2
neo/framework/FileSystem.cpp
View file

@ -1780,7 +1780,7 @@ idModList *idFileSystemLocal::ListMods( void ) {
}
list->mods.Insert( "" );
list->descriptions.Insert( "Doom 3" );
list->descriptions.Insert( "dhewm 3" );
assert( list->mods.Num() == list->descriptions.Num() );

12
neo/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
#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

2
neo/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, "" );
// 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_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 );

6
neo/sys/osx/Info.plist
View file

@ -5,17 +5,17 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>doom3</string>
<string>dhewm3</string>
<key>CFBundleIconFile</key>
<string>Doom3.icns</string>
<key>CFBundleIdentifier</key>
<string>com.idsoftware.doom3</string>
<string>org.dhewg.dhewm3</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>DOM3</string>
<string>DHM3</string>
<key>CFBundleVersion</key>
<string>3000</string>
<key>NSMainNibFile</key>