Update glslang

effekseer · Mar 5, 2024 · 142ad43 · 142ad43
1 parent 1bcc8ea
commit 142ad43
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -161,6 +161,7 @@ if(BUILD_VULKAN)
         set(ENABLE_HLSL OFF CACHE BOOL "For glslang" FORCE)
         set(ENABLE_CTEST OFF CACHE BOOL "For glslang" FORCE)
         set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "For glslang" FORCE)
+        set(ENABLE_OPT OFF CACHE BOOL "For glslang" FORCE)
 
         set(GLSLANG_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Dev/Cpp/3rdParty/glslang/" "${CMAKE_CURRENT_SOURCE_DIR}/Dev/Cpp/3rdParty/")
         add_subdirectory(Dev/Cpp/3rdParty/glslang/)
@@ -399,7 +400,6 @@ if (BUILD_VULKAN)
     set_target_properties (GenericCodeGen PROPERTIES FOLDER Thirdparty/glslang)
     set_target_properties (glslang PROPERTIES FOLDER Thirdparty/glslang)
     set_target_properties (MachineIndependent PROPERTIES FOLDER Thirdparty/glslang)
-    set_target_properties (OGLCompiler PROPERTIES FOLDER Thirdparty/glslang)
     set_target_properties (OSDependent PROPERTIES FOLDER Thirdparty/glslang)
     set_target_properties (SPIRV PROPERTIES FOLDER Thirdparty/glslang)
     set_target_properties (SPVRemapper PROPERTIES FOLDER Thirdparty/glslang)

diff --git a/Dev/Cpp/3rdParty/LLGI b/Dev/Cpp/3rdParty/LLGI
diff --git a/Dev/Cpp/3rdParty/glslang b/Dev/Cpp/3rdParty/glslang
diff --git a/Dev/Cpp/Test/CMakeLists.txt b/Dev/Cpp/Test/CMakeLists.txt
@@ -130,7 +130,6 @@ if(BUILD_VULKAN)
         PRIVATE 
         glslang
         SPIRV
-        OGLCompiler
         OSDependent
     )
 

diff --git a/Dev/Cpp/TestRuntimeFramework/CMakeLists.txt b/Dev/Cpp/TestRuntimeFramework/CMakeLists.txt
@@ -160,7 +160,6 @@ if(BUILD_VULKAN)
         glslang
         glslang-default-resource-limits
         SPIRV
-        OGLCompiler
         OSDependent
     )
 

diff --git a/Examples/GpuParticles/CMakeLists.txt b/Examples/GpuParticles/CMakeLists.txt
@@ -84,7 +84,6 @@ if (BUILD_VULKAN)
         glslang
         glslang-default-resource-limits
         SPIRV
-        OGLCompiler
         OSDependent
         EffekseerRendererVulkan
     )

diff --git a/Examples/Vulkan/CMakeLists.txt b/Examples/Vulkan/CMakeLists.txt
@@ -33,7 +33,6 @@ target_link_libraries(
     glslang
     glslang-default-resource-limits
     SPIRV
-    OGLCompiler
     OSDependent
 )