afeica
/
cocos-engine-external
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3d-gfx' into glslang1

This commit is contained in:
coulsonwang 2020-05-09 14:29:36 +08:00 committed by GitHub
parent aec8fb4c06 567c0862d5
commit 364761f4d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/CMakeLists.txt
View File

@ -175,19 +175,19 @@ endif()
add_library(glslang STATIC IMPORTED GLOBAL) add_library(glslang STATIC IMPORTED GLOBAL)
set_target_properties(glslang PROPERTIES 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) add_library(OGLCompiler STATIC IMPORTED GLOBAL)
set_target_properties(OGLCompiler PROPERTIES 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) add_library(OSDependent STATIC IMPORTED GLOBAL)
set_target_properties(OSDependent PROPERTIES 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) add_library(SPIRV STATIC IMPORTED GLOBAL)
set_target_properties(SPIRV PROPERTIES 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) 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/uv
${platform_spec_path}/include/glslang ${platform_spec_path}/include/glslang
${CMAKE_ANDROID_NDK}/sources/android/native_app_glue ${CMAKE_ANDROID_NDK}/sources/android/native_app_glue
) )

BIN
android/arm64-v8a/glslang/libOGLCompiler.a
View File

Binary file not shown.

BIN
android/arm64-v8a/glslang/libOSDependent.a
View File

Binary file not shown.

BIN
android/arm64-v8a/glslang/libSPIRV.a
View File

Binary file not shown.

BIN
android/arm64-v8a/glslang/libglslang.a
View File

Binary file not shown.

BIN
android/armeabi-v7a/glslang/libOGLCompiler.a
View File

Binary file not shown.

BIN
android/armeabi-v7a/glslang/libOSDependent.a
View File

Binary file not shown.

BIN
android/armeabi-v7a/glslang/libSPIRV.a
View File

Binary file not shown.

BIN
android/armeabi-v7a/glslang/libglslang.a
View File

Binary file not shown.

BIN
android/x86/glslang/libOGLCompiler.a
View File

Binary file not shown.

BIN
android/x86/glslang/libOSDependent.a
View File

Binary file not shown.

BIN
android/x86/glslang/libSPIRV.a
View File

Binary file not shown.

BIN
android/x86/glslang/libglslang.a
View File

Binary file not shown.

16
mac/CMakeLists.txt
View File

@ -133,33 +133,33 @@ endif()
add_library(glslang STATIC IMPORTED GLOBAL) add_library(glslang STATIC IMPORTED GLOBAL)
set_target_properties(glslang PROPERTIES 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) add_library(OGLCompiler STATIC IMPORTED GLOBAL)
set_target_properties(OGLCompiler PROPERTIES 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) add_library(OSDependent STATIC IMPORTED GLOBAL)
set_target_properties(OSDependent PROPERTIES 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) add_library(SPIRV STATIC IMPORTED GLOBAL)
set_target_properties(SPIRV PROPERTIES 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) set(glslang_libs_name glslang OGLCompiler OSDependent SPIRV)
add_library(spirv-cross-core STATIC IMPORTED GLOBAL) add_library(spirv-cross-core STATIC IMPORTED GLOBAL)
set_target_properties(spirv-cross-core PROPERTIES 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) add_library(spirv-cross-msl STATIC IMPORTED GLOBAL)
set_target_properties(spirv-cross-msl PROPERTIES 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) add_library(spirv-cross-glsl STATIC IMPORTED GLOBAL)
set_target_properties(spirv-cross-glsl PROPERTIES 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) 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 list(APPEND CC_EXTERNAL_INCLUDES
${CMAKE_CURRENT_LIST_DIR}/include ${CMAKE_CURRENT_LIST_DIR}/include
) )