mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-01-15 16:33:15 -03:00
Externals: Update glslang to 16.0.0 and allow using system glslang
This commit is contained in:
9
Externals/glslang/CMakeLists.txt
vendored
9
Externals/glslang/CMakeLists.txt
vendored
@@ -1,7 +1,6 @@
|
||||
set(ENABLE_PCH OFF)
|
||||
set(BUILD_EXTERNAL OFF)
|
||||
set(SKIP_GLSLANG_INSTALL ON)
|
||||
set(ENABLE_SPVREMAPPER OFF)
|
||||
set(ENABLE_GLSLANG_BINARIES OFF)
|
||||
set(ENABLE_HLSL OFF)
|
||||
set(ENABLE_OPT OFF)
|
||||
@@ -10,5 +9,13 @@ set(ENABLE_EXCEPTIONS OFF)
|
||||
add_subdirectory(glslang)
|
||||
|
||||
if (TARGET glslang)
|
||||
target_include_directories(glslang
|
||||
# Silence warnings on glslang by flagging it as a system include
|
||||
SYSTEM PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/glslang>
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/glslang/Public>
|
||||
PUBLIC
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
)
|
||||
dolphin_disable_warnings(glslang)
|
||||
endif()
|
||||
|
||||
1
Externals/glslang/exports.props
vendored
1
Externals/glslang/exports.props
vendored
@@ -2,6 +2,7 @@
|
||||
<Project>
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(ExternalsDir)glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(ExternalsDir)glslang\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(ExternalsDir)glslang\glslang\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(ExternalsDir)glslang\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
|
||||
2
Externals/glslang/glslang
vendored
2
Externals/glslang/glslang
vendored
Submodule Externals/glslang/glslang updated: 8a85691a07...a57276bf55
Reference in New Issue
Block a user