id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-01 23:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1 from DanielGibson/rb_static-rt

Browse source 
Use static runtime, remove 2 annoying assertions
This commit is contained in:
RobertBeckebans 2012-11-28 12:59:56 -08:00
commit 585a04dfe4
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
neo/CMakeLists.txt
View file

@ -24,6 +24,12 @@ elseif(MSVC)
# Multiprocessor support for compiling # Multiprocessor support for compiling
# /MP # /MP
# /MT use multithreaded, static runtime library
# (=> binary won't need MSVCP100D.dll or similar)
# /MTd the same with debug symbols
# /MD and /MDd - the same with dynamic runtime lib
# (=> MSVCP100D.dll or similar is needed to run binary)
# Inline Function Expansion: Any Suitable (/Ob2) # Inline Function Expansion: Any Suitable (/Ob2)
# "/Ob2", # "/Ob2",
@ -33,15 +39,15 @@ elseif(MSVC)
# Omit Frame Pointers # Omit Frame Pointers
# "/Oy", # "/Oy",
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /D _DEBUG /MP") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /D _DEBUG /MP /MTd")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MP /Oi /Oy") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MP /Oi /Oy /MT")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MP /Oi") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MP /Oi /MTd")
set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MP /Oi /Oy") set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MP /Oi /Oy /MT")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MP /MTd")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MP /Oi /Oy") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MP /Oi /Oy /MT")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MP") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MP /MTd")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MP /Oi /Oy") set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MP /Oi /Oy /MT")
add_definitions(-DWIN32 add_definitions(-DWIN32
-D_WINDOWS -D_WINDOWS

4
neo/renderer/BufferObject.cpp
View file

@ -343,7 +343,7 @@ void* idVertexBuffer::MapBuffer( bufferMapType_t mapType ) const
{ {
buffer = ( byte* )buffer + GetOffset(); buffer = ( byte* )buffer + GetOffset();
} }
assert( IsWriteCombined( buffer ) ); // assert( IsWriteCombined( buffer ) ); // commented out because it spams the console
} }
else else
{ {
@ -619,7 +619,7 @@ void* idIndexBuffer::MapBuffer( bufferMapType_t mapType ) const
{ {
buffer = ( byte* )buffer + GetOffset(); buffer = ( byte* )buffer + GetOffset();
} }
assert( IsWriteCombined( buffer ) ); // assert( IsWriteCombined( buffer ) ); // commented out because it spams the console
} }
else else
{ {