ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10829 from AdmiralCurtiss/spirv-cross-cmake-fix 

Fix CMake Windows build after #10673 (HLSL from SPIRV).
This commit is contained in:
JosJuice 2022-07-10 09:08:24 +02:00 committed by GitHub
parent 5ce73d9d2e cdd3571491
commit 6e09b13ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Externals/spirv_cross/CMakeLists.txt vendored
View File

@ -47,6 +47,7 @@ endif()
endif()
add_library(spirv_cross STATIC ${SRCS})
dolphin_disable_warnings_msvc(spirv_cross)
target_compile_definitions(spirv_cross PUBLIC SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
target_include_directories(spirv_cross PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Cross/include ${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Cross)

9
Source/Core/VideoBackends/D3DCommon/CMakeLists.txt
View File

@ -14,6 +14,15 @@ PUBLIC
spirv_cross
)
target_include_directories(videod3dcommon
SYSTEM PUBLIC
${CMAKE_SOURCE_DIR}/Externals/glslang/glslang/Public
SYSTEM PRIVATE
${CMAKE_SOURCE_DIR}/Externals/glslang/StandAlone
${CMAKE_SOURCE_DIR}/Externals/glslang/SPIRV
${CMAKE_SOURCE_DIR}/Externals/glslang
)
if(MSVC)
# Add precompiled header
target_link_libraries(videod3dcommon PRIVATE use_pch)