piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11735 from Pokechu22/cmake-no-spirv-cross-on-linux

Browse Source 
CMake: Don't include SPIRV-Cross except on Windows and macOS
This commit is contained in:
Mai 2023-04-06 23:11:14 -04:00 committed by GitHub
commit aaedc2827d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -693,7 +693,11 @@ endif()
add_subdirectory(Externals/imgui)
add_subdirectory(Externals/implot)
add_subdirectory(Externals/glslang)
add_subdirectory(Externals/spirv_cross)
# SPIRV-Cross is used on Windows for GLSL to HLSL conversion for the Direct3D 11 and Direct3D 12
# video backends, and on Apple devices for the Metal video backend.
if(WIN32 OR APPLE)
add_subdirectory(Externals/spirv_cross)
endif()
if(ENABLE_VULKAN)
add_definitions(-DHAS_VULKAN)

2
Source/Core/Common/CMakeLists.txt
View File

@ -299,7 +299,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
target_link_libraries(common PUBLIC dl rt)
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
if(WIN32)
target_sources(common PRIVATE HRWrap.h HRWrap.cpp)
endif()

2
Source/Core/VideoBackends/CMakeLists.txt
View File

@ -2,7 +2,7 @@ add_subdirectory(OGL)
add_subdirectory(Null)
add_subdirectory(Software)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
if(WIN32)
add_subdirectory(D3DCommon)
add_subdirectory(D3D)
add_subdirectory(D3D12)