wgpu glslang lib

emscripten/CMakeLists.txt

@@ -8,41 +8,45 @@ set_target_properties(z PROPERTIES
 set(se_libs_name)
 
 ############################# glslang #############################
+list(APPEND SPIRV_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/../sources/glslang)
+list(APPEND SPIRV_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/../sources/khronos)
+add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
+set_target_properties(GenericCodeGen PROPERTIES
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libGenericCodeGen.a
+)
 
-# add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
+add_library(glslang STATIC IMPORTED GLOBAL)
-# set_target_properties(GenericCodeGen PROPERTIES
+set_target_properties(glslang PROPERTIES
-#   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libGenericCodeGen.a
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libglslang.a
-# )
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../sources/glslang
+)
 
-# # add_library(glslang STATIC IMPORTED GLOBAL)
+add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL)
-# # set_target_properties(glslang PROPERTIES
+set_target_properties(glslang-default-resource-limits PROPERTIES
-# #   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libglslang.a
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libglslang-default-resource-limits.a
-# # )
 
-# add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL)
+)
-# set_target_properties(glslang-default-resource-limits PROPERTIES
-#   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libglslang-default-resource-limits.a
-# )
 
-# add_library(MachineIndependent STATIC IMPORTED GLOBAL)
+add_library(MachineIndependent STATIC IMPORTED GLOBAL)
-# set_target_properties(MachineIndependent PROPERTIES
+set_target_properties(MachineIndependent PROPERTIES
-#   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libMachineIndependent.a
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libMachineIndependent.a
-# )
+)
 
-# add_library(OGLCompiler STATIC IMPORTED GLOBAL)
+add_library(OGLCompiler STATIC IMPORTED GLOBAL)
-# set_target_properties(OGLCompiler PROPERTIES
+set_target_properties(OGLCompiler PROPERTIES
-#   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libOGLCompiler.a
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libOGLCompiler.a
-# )
+)
 
-# add_library(OSDependent STATIC IMPORTED GLOBAL)
+add_library(OSDependent STATIC IMPORTED GLOBAL)
-# set_target_properties(OSDependent PROPERTIES
+set_target_properties(OSDependent PROPERTIES
-#   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libOSDependent.a
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libOSDependent.a
-# )
+)
 
-# add_library(SPIRV STATIC IMPORTED GLOBAL)
+add_library(SPIRV STATIC IMPORTED GLOBAL)
-# set_target_properties(SPIRV PROPERTIES
+set_target_properties(SPIRV PROPERTIES
-#   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV.a
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV.a
-# )
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/../sources/khronos
+)
 
 # add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
 # set_target_properties(SPIRV-Tools PROPERTIES
@@ -54,18 +58,18 @@ set(se_libs_name)
 #   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPIRV-Tools-opt.a
 # )
 
-# add_library(SPVRemapper STATIC IMPORTED GLOBAL)
+add_library(SPVRemapper STATIC IMPORTED GLOBAL)
-# set_target_properties(SPVRemapper PROPERTIES
+set_target_properties(SPVRemapper PROPERTIES
-#   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPVRemapper.a
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/libSPVRemapper.a
-# )
+)
 
-# set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV)
 
 ############################# SPIRV-Cross #############################
-
 # add_library(spirv-cross-core STATIC IMPORTED GLOBAL)
 # set_target_properties(spirv-cross-core PROPERTIES
 #   IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libspirv-cross-core.a
+#   INTERFACE_INCLUDE_DIRECTORIES "${SPIRV_INCLUDE_DIRS}"
 # )
 # add_library(spirv-cross-msl STATIC IMPORTED GLOBAL)
 # set_target_properties(spirv-cross-msl PROPERTIES
@@ -113,7 +117,7 @@ list(APPEND CC_EXTERNAL_LIBS
     #curl
     #crypto
     #ssl
-    #${glslang_libs_name}
+    ${glslang_libs_name}
     #${spirv-cross_libs_name}
     #${tbb_libs_name}
     ${PhysXSDK}