id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2024-12-02 08:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed RBDoom3 to RBDoom3BFG

Browse source
This commit is contained in:
Robert Beckebans 2012-12-19 15:23:57 +01:00
parent b1dabf3efd
commit f57d92a1ab
4 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
neo/CMakeLists.txt
View file

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
project(RBDoom3)
project(RBDoom3BFG)
option(USE_MFC_TOOLS
"Compile the built-in MFC based tools" OFF)
@ -1011,16 +1011,16 @@ if(MSVC)
list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
add_executable(RBDoom3 WIN32 ${RBDOOM3_SOURCES})
add_executable(RBDoom3BFG WIN32 ${RBDOOM3_SOURCES})
#add_custom_command(TARGET RBDoom3
#add_custom_command(TARGET RBDoom3BFG
# PRE_BUILD
# COMMAND nmake ARGS /f Makefile.vc6 CFG=release
# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/curl/lib
# COMMENT "Compiling libcURL")
add_dependencies(RBDoom3 idlib)
target_link_libraries(RBDoom3
add_dependencies(RBDoom3BFG idlib)
target_link_libraries(RBDoom3BFG
idlib
${DirectX_LIBRARIES}
#libcurl
@ -1071,9 +1071,9 @@ else()
list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
add_executable(RBDoom3 WIN32 ${RBDOOM3_SOURCES})
add_executable(RBDoom3BFG WIN32 ${RBDOOM3_SOURCES})
add_dependencies(RBDoom3 idlib)
add_dependencies(RBDoom3BFG idlib)
if(MINGW)
include_directories(libs/sdl2/include)
@ -1083,7 +1083,7 @@ else()
if(WIN32)
target_link_libraries(RBDoom3
target_link_libraries(RBDoom3BFG
idlib
${DirectX_LIBRARIES}
#libcurl
@ -1101,7 +1101,7 @@ else()
endif()
if(UNIX)
target_link_libraries(RBDoom3
target_link_libraries(RBDoom3BFG
idlib
GL
pthread

2
neo/renderer/tr_local.h
View file

@ -1038,7 +1038,7 @@ struct vidMode_t
}
vidMode_t( int width, int height, int displayHz ) :
width(width), height(height), displayHz(displayHz) {}
width( width ), height( height ), displayHz( displayHz ) {}
// RB end
bool operator==( const vidMode_t& a )

7
neo/sys/linux/linux_main.cpp
View file

@ -54,11 +54,8 @@ static idStr savepath;
*/
const char* Sys_DefaultSavePath()
{
#if defined( ID_DEMO_BUILD )
sprintf( savepath, "%s/.rbdoom3-demo", getenv( "HOME" ) );
#else
sprintf( savepath, "%s/.rbdoom3", getenv( "HOME" ) );
#endif
sprintf( savepath, "%s/.rbdoom3bfg", getenv( "HOME" ) );
return savepath.c_str();
}
/*

2
neo/sys/sdl/sdl_glimp.cpp
View file

@ -457,7 +457,7 @@ bool R_GetModeListForDisplay( const int requestedDisplayNum, idList<vidMode_t>&
// requested invalid displaynum
return false;
}
int numModes = SDL_GetNumDisplayModes( requestedDisplayNum );
if( numModes > 0 )
{