diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 98e95a23..79b83ba5 100644 --- a/android/CMakeLists.txt +++ b/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/libglslang.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/libOGLCompiler.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/libOSDependent.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/libSPIRV.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 -) \ No newline at end of file +) diff --git a/android/arm64-v8a/glslang/libOGLCompiler.a b/android/arm64-v8a/glslang/libOGLCompiler.a index fe032c64..8331ae5e 100644 Binary files a/android/arm64-v8a/glslang/libOGLCompiler.a and b/android/arm64-v8a/glslang/libOGLCompiler.a differ diff --git a/android/arm64-v8a/glslang/libOSDependent.a b/android/arm64-v8a/glslang/libOSDependent.a index 3aaae6f5..8e252c16 100644 Binary files a/android/arm64-v8a/glslang/libOSDependent.a and b/android/arm64-v8a/glslang/libOSDependent.a differ diff --git a/android/arm64-v8a/glslang/libSPIRV.a b/android/arm64-v8a/glslang/libSPIRV.a index 0787405d..08a03c31 100644 Binary files a/android/arm64-v8a/glslang/libSPIRV.a and b/android/arm64-v8a/glslang/libSPIRV.a differ diff --git a/android/arm64-v8a/glslang/libglslang.a b/android/arm64-v8a/glslang/libglslang.a index 9fc26073..22f850be 100644 Binary files a/android/arm64-v8a/glslang/libglslang.a and b/android/arm64-v8a/glslang/libglslang.a differ diff --git a/android/armeabi-v7a/glslang/libOGLCompiler.a b/android/armeabi-v7a/glslang/libOGLCompiler.a index cfe632da..5de7a6cb 100644 Binary files a/android/armeabi-v7a/glslang/libOGLCompiler.a and b/android/armeabi-v7a/glslang/libOGLCompiler.a differ diff --git a/android/armeabi-v7a/glslang/libOSDependent.a b/android/armeabi-v7a/glslang/libOSDependent.a index 2ce93b8d..2a40f08e 100644 Binary files a/android/armeabi-v7a/glslang/libOSDependent.a and b/android/armeabi-v7a/glslang/libOSDependent.a differ diff --git a/android/armeabi-v7a/glslang/libSPIRV.a b/android/armeabi-v7a/glslang/libSPIRV.a index 676a80b5..48c1bac6 100644 Binary files a/android/armeabi-v7a/glslang/libSPIRV.a and b/android/armeabi-v7a/glslang/libSPIRV.a differ diff --git a/android/armeabi-v7a/glslang/libglslang.a b/android/armeabi-v7a/glslang/libglslang.a index 7875f944..d051ac8a 100644 Binary files a/android/armeabi-v7a/glslang/libglslang.a and b/android/armeabi-v7a/glslang/libglslang.a differ diff --git a/android/x86/glslang/libOGLCompiler.a b/android/x86/glslang/libOGLCompiler.a index a27cb1cb..f7a149cb 100644 Binary files a/android/x86/glslang/libOGLCompiler.a and b/android/x86/glslang/libOGLCompiler.a differ diff --git a/android/x86/glslang/libOSDependent.a b/android/x86/glslang/libOSDependent.a index a6a3d55d..e30f805a 100644 Binary files a/android/x86/glslang/libOSDependent.a and b/android/x86/glslang/libOSDependent.a differ diff --git a/android/x86/glslang/libSPIRV.a b/android/x86/glslang/libSPIRV.a index 85c633f0..698f191a 100644 Binary files a/android/x86/glslang/libSPIRV.a and b/android/x86/glslang/libSPIRV.a differ diff --git a/android/x86/glslang/libglslang.a b/android/x86/glslang/libglslang.a index fc5e33dd..f3f5c1dd 100644 Binary files a/android/x86/glslang/libglslang.a and b/android/x86/glslang/libglslang.a differ diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt index 9d4c4fbb..3113c659 100644 --- a/mac/CMakeLists.txt +++ b/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/libglslang.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/libOGLCompiler.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/libOSDependent.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/libSPIRV.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 -) \ No newline at end of file +)