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

Merge branch 'master' into vma-integration

Browse source
This commit is contained in:
Robert Beckebans 2023-02-22 13:19:55 +01:00
commit bdd5d8dd81
4 changed files with 12 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
neo/CMakeLists.txt
View file

@ -520,19 +520,6 @@ file(GLOB RENDERER_VULKAN_SOURCES renderer/Vulkan/*.cpp)
file(GLOB RENDERER_NVRHI_INCLUDES renderer/NVRHI/*.h)
file(GLOB RENDERER_NVRHI_SOURCES renderer/NVRHI/*.cpp)
# Add shaders to edit them in Visual Studio
file(GLOB SHADERS shaders/*.hlsl shaders/*.inc )
file(GLOB SHADERS_BUILTIN shaders/builtin/*.hlsl )
file(GLOB SHADERS_BUILTIN_DEBUG shaders/builtin/debug/*.hlsl )
file(GLOB SHADERS_BUILTIN_FOG shaders/builtin/fog/*.hlsl )
file(GLOB SHADERS_BUILTIN_LEGACY shaders/builtin/legacy/*.hlsl )
file(GLOB SHADERS_BUILTIN_LIGHTING shaders/builtin/lighting/*.hlsl )
file(GLOB SHADERS_BUILTIN_POST shaders/builtin/post/*.hlsl )
file(GLOB SHADERS_BUILTIN_SSAO shaders/builtin/SSAO/*.hlsl )
file(GLOB SHADERS_BUILTIN_SSGI shaders/builtin/SSGI/*.hlsl )
file(GLOB SHADERS_BUILTIN_VIDEO shaders/builtin/video/*.hlsl )
file(GLOB SHADERS_BUILTIN_VR shaders/builtin/VR/*.hlsl )
file(GLOB IRRXML_INCLUDES libs/irrxml/src/*.h)
file(GLOB IRRXML_SOURCES libs/irrxml/src/*.cpp)
@ -1158,19 +1145,6 @@ source_group("renderer\\Vulkan" FILES ${RENDERER_VULKAN_SOURCES})
source_group("renderer\\SMAA" FILES ${RENDERER_SMAA_INCLUDES})
# Add shaders to edit them in Visual Studio
source_group("renderer\\Shaders" FILES ${SHADERS})
source_group("renderer\\Shaders\\builtin" FILES ${SHADERS_BUILTIN})
source_group("renderer\\Shaders\\builtin\\debug" FILES ${SHADERS_BUILTIN_DEBUG})
source_group("renderer\\Shaders\\builtin\\fog" FILES ${SHADERS_BUILTIN_FOG})
source_group("renderer\\Shaders\\builtin\\legacy" FILES ${SHADERS_BUILTIN_LEGACY})
source_group("renderer\\Shaders\\builtin\\lighting" FILES ${SHADERS_BUILTIN_LIGHTING})
source_group("renderer\\Shaders\\builtin\\post" FILES ${SHADERS_BUILTIN_POST})
source_group("renderer\\Shaders\\builtin\\SSAO" FILES ${SHADERS_BUILTIN_SSAO})
source_group("renderer\\Shaders\\builtin\\SSGI" FILES ${SHADERS_BUILTIN_SSGI})
source_group("renderer\\Shaders\\builtin\\video" FILES ${SHADERS_BUILTIN_VIDEO})
source_group("renderer\\Shaders\\builtin\\VR" FILES ${SHADERS_BUILTIN_VR})
source_group("libs\\irrxml" FILES ${IRRXML_INCLUDES})
source_group("libs\\irrxml" FILES ${IRRXML_SOURCES})
@ -1356,18 +1330,6 @@ set(RBDOOM3_INCLUDES
${RENDERER_JOBS_STATICSHADOWVOLUME_INCLUDES}
${RENDERER_PASSES_INCLUDES}
${SHADERS}
${SHADERS_BUILTIN}
${SHADERS_BUILTIN_DEBUG}
${SHADERS_BUILTIN_FOG}
${SHADERS_BUILTIN_LEGACY}
${SHADERS_BUILTIN_LIGHTING}
${SHADERS_BUILTIN_POST}
${SHADERS_BUILTIN_SSAO}
${SHADERS_BUILTIN_SSGI}
${SHADERS_BUILTIN_VIDEO}
${SHADERS_BUILTIN_VR}
${RENDERER_SMAA_INCLUDES}
${IRRXML_INCLUDES}
${FRAMEWORK_IMGUI_INCLUDES}
@ -1625,18 +1587,6 @@ if(MSVC)
)
endif()
set_source_files_properties( ${SHADERS} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_DEBUG} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_FOG} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_LEGACY} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_LIGHTING} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_POST} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_SSAO} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_SSGI} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_VIDEO} PROPERTIES VS_TOOL_OVERRIDE "None" )
set_source_files_properties( ${SHADERS_BUILTIN_VR} PROPERTIES VS_TOOL_OVERRIDE "None" )
list(APPEND RBDOOM3_SOURCES ${WIN32_RESOURCES})
add_executable(RBDoom3BFG WIN32 ${RBDOOM3_INCLUDES} ${RBDOOM3_SOURCES})

0
neo/cmake-vs2019-64bit-no-ffmpeg.bat → neo/cmake-vs2019-win64-no-ffmpeg.bat
View file

6
neo/cmake-vs2022-win64-no-ffmpeg.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 ../neo
pause

6
neo/cmake-vs2022-win64.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=ON -DBINKDEC=OFF ../neo
pause