Merge pull request #89 from Mee-gu/fixGlslangAndroid

fix glslang for android

android/CMakeLists.txt

@@ -175,19 +175,19 @@ endif()
 
 add_library(glslang STATIC IMPORTED GLOBAL)
 set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${platform_spec_path}/glslang/glslang.lib
+  IMPORTED_LOCATION ${platform_spec_path}/glslang/libglslang.a
 )
 add_library(OGLCompiler STATIC IMPORTED GLOBAL)
 set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${platform_spec_path}/glslang/OGLCompiler.lib
+  IMPORTED_LOCATION ${platform_spec_path}/glslang/libOGLCompiler.a
 )
 add_library(OSDependent STATIC IMPORTED GLOBAL)
 set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${platform_spec_path}/glslang/OSDependent.lib
+  IMPORTED_LOCATION ${platform_spec_path}/glslang/libOSDependent.a
 )
 add_library(SPIRV STATIC IMPORTED GLOBAL)
 set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${platform_spec_path}/glslang/SPIRV.lib
+  IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV.a
 )
 set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV)
 
@@ -211,4 +211,4 @@ list(APPEND CC_EXTERNAL_INCLUDES
   ${platform_spec_path}/include/uv
   ${platform_spec_path}/include/glslang
   ${CMAKE_ANDROID_NDK}/sources/android/native_app_glue
-)
+)

mac/CMakeLists.txt

@@ -133,33 +133,33 @@ endif()
 
 add_library(glslang STATIC IMPORTED GLOBAL)
 set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang.lib
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libglslang.a
 )
 add_library(OGLCompiler STATIC IMPORTED GLOBAL)
 set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/OGLCompiler.lib
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libOGLCompiler.a
 )
 add_library(OSDependent STATIC IMPORTED GLOBAL)
 set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/OSDependent.lib
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libOSDependent.a
 )
 add_library(SPIRV STATIC IMPORTED GLOBAL)
 set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/SPIRV.lib
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libSPIRV.a
 )
 set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV)
 
 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.lib
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libspirv-cross-core.a
 )
 add_library(spirv-cross-msl STATIC IMPORTED GLOBAL)
 set_target_properties(spirv-cross-msl PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libspirv-cross-msl.lib
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libspirv-cross-msl.a
 )
 add_library(spirv-cross-glsl STATIC IMPORTED GLOBAL)
 set_target_properties(spirv-cross-glsl PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libspirv-cross-glsl.lib
+  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/libspirv-cross-glsl.a
 )
 set(spirv-cross_libs_name spirv-cross-core spirv-cross-glsl spirv-cross-msl)
 
@@ -181,4 +181,4 @@ list(APPEND CC_EXTERNAL_LIBS
 
 list(APPEND CC_EXTERNAL_INCLUDES
   ${CMAKE_CURRENT_LIST_DIR}/include
-)
+)