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

fix android/mac cmake list (#88)

This commit is contained in:
Yun Hsiao Wu 2020-05-08 15:04:43 +08:00 committed by GitHub
parent 67e2d855bd
commit 226722dfb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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/glslang.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/OGLCompiler.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/OSDependent.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/SPIRV.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)

14
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/glslang.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/OGLCompiler.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/OSDependent.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/SPIRV.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)