fix glslang cmake (#96 )

update glslang cmake (#95 )
fix glslang cmake config (#94 )
2020-05-19 17:48:56 +08:00 · 2020-05-19 16:56:54 +08:00 · 2020-05-19 15:27:13 +08:00 · 2020-05-18 16:28:53 +08:00 · 2020-05-12 16:37:07 +08:00 · 2020-05-12 16:25:03 +08:00
25 changed files with 20 additions and 6 deletions
@@ -238,22 +238,36 @@ endif()

 add_library(glslang STATIC IMPORTED GLOBAL)
 set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib
+  IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslangd.lib
+  IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib
+)
+add_library(HLSL STATIC IMPORTED GLOBAL)
+set_target_properties(HLSL PROPERTIES
+  IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/HLSLd.lib
+  IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/HLSL.lib
 )
 add_library(OGLCompiler STATIC IMPORTED GLOBAL)
 set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib
+  IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompilerd.lib
+  IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib
 )
 add_library(OSDependent STATIC IMPORTED GLOBAL)
 set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib
+  IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependentd.lib
+  IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib
 )
 add_library(SPIRV STATIC IMPORTED GLOBAL)
 set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib
+  IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRVd.lib
+  IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib
+)
+add_library(SPVRemapper STATIC IMPORTED GLOBAL)
+set_target_properties(SPVRemapper PROPERTIES
+  IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapperd.lib
+  IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.lib
 )
 list(APPEND CC_EXTERNAL_INCLUDES ${CMAKE_CURRENT_LIST_DIR}/include/glslang)
-set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV)
+set(glslang_libs_name glslang HLSL OGLCompiler OSDependent SPIRV SPVRemapper)

 list(APPEND CC_EXTERNAL_LIBS
    freetype
@@ -285,4 +299,4 @@ list(APPEND CC_EXTERNAL_LIBS

 list(APPEND CC_EXTERNAL_INCLUDES
  ${CMAKE_CURRENT_LIST_DIR}/include
-)
+)
Author	SHA1	Message	Date
Yun Hsiao WuandGitHub	491c1d785b	fix glslang cmake (#96 )	2020-05-19 17:48:56 +08:00
Yun Hsiao WuandGitHub	ae147ecb86	update glslang cmake (#95 )	2020-05-19 16:56:54 +08:00
Yun Hsiao WuandGitHub	4248962172	fix glslang cmake config (#94 )	2020-05-19 15:27:13 +08:00
Yun Hsiao WuandGitHub	dfb0597acf	update glslang (#93 )	2020-05-18 16:28:53 +08:00
江战andGitHub	42a2398d29	Merge pull request #91 from Mee-gu/fixAndroidGlslang compiel glslang to android-16 for android	2020-05-12 16:37:07 +08:00
coulsonwang	a8ca409eef	compiel glslang to android-16 for android	2020-05-12 16:25:03 +08:00