@@ -142,7 +142,7 @@ index 614061ad4..20ac1a2f4 100644
142142
143143 # Note that this has to be placed after mikktspace in order for combine_static_libs to work.
144144 add_subdirectory(${LIBRARIES}/geometry)
145- @@ -761,9 +833,16 @@ add_subdirectory(${LIBRARIES}/geometry)
145+ @@ -761,9 +833,19 @@ add_subdirectory(${LIBRARIES}/geometry)
146146 if (FILAMENT_BUILD_FILAMAT OR IS_HOST_PLATFORM)
147147 # spirv-tools must come before filamat, as filamat relies on the presence of the
148148 # spirv-tools_SOURCE_DIR variable.
@@ -155,14 +155,17 @@ index 614061ad4..20ac1a2f4 100644
155155+ add_external_library("SPIRV-Tools" "spirv-tools" "SPIRV-Tools-static" "SPIRV-Tools")
156156+ endif()
157157+ add_external_library("SPIRV-Tools-opt" "spirv-tools" "SPIRV-Tools-opt" "SPIRV-Tools-opt")
158- + add_external_library("glslang" "glslang/tnt" "glslang::glslang;glslang::SPIRV;glslang::OGLCompiler" "glslang;SPIRV;OGLCompiler")
158+ + add_external_library("glslang" "glslang/tnt" "glslang::glslang;glslang::SPIRV;glslang::OGLCompiler;glslang::MachineIndependent;glslang::OSDependent" "glslang;SPIRV;OGLCompiler;MachineIndependent;OSDependent")
159+ + if(TARGET glslang::glslang AND TARGET glslang::MachineIndependent)
160+ + target_link_libraries(glslang::glslang INTERFACE glslang::MachineIndependent)
161+ + endif()
159162+ add_external_library("spirv_cross_core" "spirv-cross/tnt" "spirv-cross-core" "spirv-cross-core")
160163+ add_external_library("spirv_cross_glsl" "spirv-cross/tnt" "spirv-cross-glsl" "spirv-cross-glsl")
161164+ add_external_library("spirv_cross_msl" "spirv-cross/tnt" "spirv-cross-msl" "spirv-cross-msl")
162165 add_subdirectory(${LIBRARIES}/filamat)
163166
164167 # the material debugger requires filamat
165- @@ -774,9 +853 ,9 @@ endif()
168+ @@ -774,9 +856 ,9 @@ endif()
166169
167170 if (FILAMENT_SUPPORTS_VULKAN)
168171 add_subdirectory(${LIBRARIES}/bluevk)
@@ -174,7 +177,7 @@ index 614061ad4..20ac1a2f4 100644
174177 endif()
175178
176179 set(FILAMENT_SAMPLES_BINARY_DIR ${PROJECT_BINARY_DIR}/samples)
177- @@ -797,11 +876 ,11 @@ if (IS_HOST_PLATFORM)
180+ @@ -797,11 +879 ,11 @@ if (IS_HOST_PLATFORM)
178181
179182 add_subdirectory(${FILAMENT}/samples)
180183
0 commit comments