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

fix glslang link order (#198)

This commit is contained in:
Yun Hsiao Wu 2021-11-12 11:46:34 +08:00 committed by GitHub
parent 7b043c5a76
commit 4f972469ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
android/CMakeLists.txt
View File

@ -105,52 +105,13 @@ endif()
############################# glslang #############################
add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
set_target_properties(GenericCodeGen PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/glslang/libGenericCodeGen.a
)
add_library(glslang STATIC IMPORTED GLOBAL)
set_target_properties(glslang PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/glslang/libglslang.a
)
add_library(glslang-default-resource-limits STATIC IMPORTED GLOBAL)
set_target_properties(glslang-default-resource-limits PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/glslang/libglslang-default-resource-limits.a
)
add_library(MachineIndependent STATIC IMPORTED GLOBAL)
set_target_properties(MachineIndependent PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/glslang/libMachineIndependent.a
)
add_library(OGLCompiler STATIC IMPORTED GLOBAL)
set_target_properties(OGLCompiler PROPERTIES
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.a
)
add_library(SPIRV STATIC IMPORTED GLOBAL)
set_target_properties(SPIRV PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV.a
)
add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
set_target_properties(SPIRV-Tools PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV-Tools.a
)
add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
set_target_properties(SPIRV-Tools-opt PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV-Tools-opt.a
)
set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools GenericCodeGen)
set(glslang_libs_name glslang glslang-default-resource-limits SPIRV MachineIndependent OGLCompiler OSDependent SPIRV-Tools-opt SPIRV-Tools GenericCodeGen)
foreach(lib IN LISTS glslang_libs_name)
add_library(${lib} STATIC IMPORTED GLOBAL)
set_target_properties(${lib} PROPERTIES
IMPORTED_LOCATION ${platform_spec_path}/glslang/lib${lib}.a
)
endforeach()
############################# TBB #############################

2
win32/CMakeLists.txt
View File

@ -200,7 +200,7 @@ endif()
############################# glslang #############################
set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen)
set(glslang_libs_name glslang glslang-default-resource-limits SPIRV MachineIndependent OGLCompiler OSDependent SPIRV-Tools-opt SPIRV-Tools GenericCodeGen)
foreach(gl IN LISTS glslang_libs_name)
add_library(${gl} STATIC IMPORTED GLOBAL)
set_target_properties(${gl} PROPERTIES

3
win64/CMakeLists.txt
View File

@ -200,7 +200,7 @@ endif()
############################# glslang #############################
set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt GenericCodeGen)
set(glslang_libs_name glslang glslang-default-resource-limits SPIRV MachineIndependent OGLCompiler OSDependent SPIRV-Tools-opt SPIRV-Tools GenericCodeGen)
foreach(gl IN LISTS glslang_libs_name)
add_library(${gl} STATIC IMPORTED GLOBAL)
set_target_properties(${gl} PROPERTIES
@ -208,6 +208,7 @@ foreach(gl IN LISTS glslang_libs_name)
IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib
)
endforeach()
############################# TBB #############################
add_library(tbb SHARED IMPORTED GLOBAL)