dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake: Fix bundled glslang

Browse Source
This commit is contained in:
TellowKrinkle 2025-10-24 22:56:46 -05:00
parent a2913abeb9
commit d404805b7f
5 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -653,14 +653,8 @@ dolphin_find_optional_system_library_pkgconfig(FMT
add_subdirectory(Externals/imgui) add_subdirectory(Externals/imgui)
add_subdirectory(Externals/implot) add_subdirectory(Externals/implot)
# A few distributions (mainly Debian-based ones) distribute glslang without linking it against SPIRV-Tools dolphin_find_optional_system_library(glslang Externals/glslang 15.0)
find_package(SPIRV-Tools)
if(SPIRV-Tools_FOUND)
dolphin_find_optional_system_library(glslang Externals/glslang 15.0)
target_link_libraries(glslang::glslang INTERFACE SPIRV-Tools)
else()
dolphin_add_bundled_library(glslang OFF Externals/glslang)
endif()
# SPIRV-Cross is used on Windows for GLSL to HLSL conversion for the Direct3D 11 and Direct3D 12 # 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. # video backends, and on Apple devices for the Metal video backend.
if(WIN32 OR APPLE) if(WIN32 OR APPLE)

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

@ -12,8 +12,6 @@ PUBLIC
common common
videocommon videocommon
spirv_cross spirv_cross
PRIVATE
glslang::glslang
) )
if(MSVC) if(MSVC)

1
Source/Core/VideoBackends/Metal/CMakeLists.txt
View File

@ -35,7 +35,6 @@ PUBLIC
videocommon videocommon
PRIVATE PRIVATE
spirv_cross spirv_cross
glslang::glslang
${FOUNDATION_LIBRARY} ${FOUNDATION_LIBRARY}
${METAL_LIBRARY} ${METAL_LIBRARY}
${QUARTZCORE_LIBRARY} ${QUARTZCORE_LIBRARY}

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

@ -43,8 +43,6 @@ PUBLIC
videocommon videocommon
PRIVATE PRIVATE
# Link against glslang, the other necessary libraries are referenced by the executable.
glslang::glslang
xxhash::xxhash xxhash::xxhash
) )

3
Source/Core/VideoCommon/CMakeLists.txt
View File

@ -218,13 +218,14 @@ add_library(videocommon
target_link_libraries(videocommon target_link_libraries(videocommon
PUBLIC PUBLIC
core core
glslang::glslang
PRIVATE PRIVATE
fmt::fmt fmt::fmt
spng::spng spng::spng
xxhash::xxhash xxhash::xxhash
imgui imgui
implot implot
glslang::glslang glslang::SPIRV
tinygltf tinygltf
) )