id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 02:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix PCH with VMA allocator for all platforms: Win32, Linux, macOS

Browse source
This commit is contained in:
Stephen Saunders 2023-02-16 20:22:25 -05:00
parent 5a881847be
commit 658521bd22
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
neo/CMakeLists.txt
View file

@ -105,7 +105,7 @@ if(UNIX)
endif()
# SRS - For single-config dev builds, define NO_MULTI_CONFIG to search for basepath up 1 dir level vs 2
if((CMAKE_GENERATOR MATCHES "Unix Makefiles") OR
if((CMAKE_GENERATOR MATCHES "Makefiles") OR
(CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_GENERATOR MATCHES "Multi-Config"))
add_definitions(-DNO_MULTI_CONFIG)
endif()
@ -1603,7 +1603,7 @@ if(MSVC)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
if(USE_VULKAN AND USE_VMA)
if(USE_VULKAN)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sys/DeviceManager_VK.cpp)
endif()
@ -1757,7 +1757,7 @@ else()
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/prelightshadowvolume/PreLightShadowVolume.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/staticshadowvolume/StaticShadowVolume.cpp)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/renderer/jobs/ShadowShared.cpp)
if(USE_VULKAN AND USE_VMA)
if(USE_VULKAN)
list(REMOVE_ITEM RBDOOM3_PRECOMPILED_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sys/DeviceManager_VK.cpp)
endif()

8
neo/sys/DeviceManager_VK.cpp
View file

@ -20,11 +20,9 @@
* DEALINGS IN THE SOFTWARE.
*/
// SRS - Disable PCH for USE_AMD_ALLOCATOR option, otherwise get Vulkan header mismatch failures
#if !defined( USE_AMD_ALLOCATOR )
#include <precompiled.h>
#pragma hdrstop
#endif
// SRS - Disable PCH here, otherwise get Vulkan header mismatch failures with USE_AMD_ALLOCATOR option
//#include <precompiled.h>
//#pragma hdrstop
#include <string>
#include <queue>