id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 06:34:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compile problems with -DSTANDALONE flag

Browse source
This commit is contained in:
Robert Beckebans 2024-02-04 15:36:55 +01:00
parent 8db4752fc0
commit 1ebd075215
4 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
neo/cmake-vs2022-win64-standalone.bat Normal file
View file

@ -0,0 +1,6 @@
cd ..
del /s /q build
mkdir build
cd build
cmake -G "Visual Studio 17" -A x64 -DFFMPEG=OFF -DBINKDEC=ON -DSTANDALONE=ON ../neo
pause

2
neo/framework/Licensee.h
View file

@ -44,7 +44,7 @@ If you have questions concerning this license or the applicable additional terms
// RB end
// jmarshall
#define ENGINE_BRANCH "Retro 80s/90s"
#define ENGINE_BRANCH "master"
// jmarshall end
#ifdef STANDALONE

2
neo/renderer/RenderSystem_init.cpp
View file

@ -2211,10 +2211,12 @@ void idRenderSystemLocal::Shutdown()
// SRS - wait for fence to hit before freeing any resources the GPU may be using, otherwise get Vulkan validation layer errors on shutdown
// SRS - skip this step if we are in a Doom Classic game
#if defined(USE_DOOMCLASSIC)
if( common->GetCurrentGame() == DOOM3_BFG )
{
backend.GL_BlockingSwapBuffers();
}
#endif
// free the vertex cache, which should have nothing allocated now
vertexCache.Shutdown();

24
neo/shaders/CMakeLists.txt
View file

@ -31,10 +31,20 @@ source_group("global" FILES ${globalshaders})
source_group("user" FILES ${usershaders})
compile_shaders_all_platforms(
TARGET Shaders
CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/shaders.cfg
OUTPUT_BASE ${CMAKE_CURRENT_SOURCE_DIR}/../../base/renderprogs2 # This path scheme is a bit odd.
SHADER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
SOURCES ${shaders}
)
if(STANDALONE)
compile_shaders_all_platforms(
TARGET Shaders
CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/shaders.cfg
OUTPUT_BASE ${CMAKE_CURRENT_SOURCE_DIR}/../../content/renderprogs2
SHADER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
SOURCES ${shaders}
)
else()
compile_shaders_all_platforms(
TARGET Shaders
CONFIG ${CMAKE_CURRENT_SOURCE_DIR}/shaders.cfg
OUTPUT_BASE ${CMAKE_CURRENT_SOURCE_DIR}/../../base/renderprogs2 # This path scheme is a bit odd.
SHADER_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
SOURCES ${shaders}
)
endif()