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

Merge pull request #225 from cocos-creator/v3.5 

merge V3.5
This commit is contained in:
minggo 2022-03-08 14:38:39 +08:00 committed by GitHub
parent eddd5fcae3 4ab24d8bf3
commit a1537c3512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
linux/CMakeLists.txt
View File

@ -9,9 +9,9 @@ set_target_properties(uv PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/libuv INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/libuv
) )
add_library(mpg123 SHARED IMPORTED GLOBAL) add_library(mpg123 STATIC IMPORTED GLOBAL)
set_target_properties(mpg123 PROPERTIES set_target_properties(mpg123 PROPERTIES
IMPORTED_LOCATION ${linux_lib_dir}/mpg123/libmpg123.so IMPORTED_LOCATION ${linux_lib_dir}/mpg123/libmpg123.a
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/mpg123 INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/mpg123
) )
@ -32,15 +32,15 @@ set_target_properties(vorbis PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/vorbis INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/vorbis
) )
add_library(libz SHARED IMPORTED GLOBAL) add_library(libz STATIC IMPORTED GLOBAL)
set_target_properties(libz PROPERTIES set_target_properties(libz PROPERTIES
IMPORTED_LOCATION ${linux_lib_dir}/libz/libz.so.1.2.11 IMPORTED_LOCATION ${linux_lib_dir}/libz/libz.a
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/libz INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/libz
) )
add_library(sqlite3 SHARED IMPORTED GLOBAL) add_library(sqlite3 STATIC IMPORTED GLOBAL)
set_target_properties(sqlite3 PROPERTIES set_target_properties(sqlite3 PROPERTIES
IMPORTED_LOCATION ${linux_lib_dir}/sqlite/libsqlite3.so.0.8.6 IMPORTED_LOCATION ${linux_lib_dir}/sqlite/libsqlite3.a
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/sqlite INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/sqlite
) )
@ -49,9 +49,9 @@ set_target_properties(v8 PROPERTIES
IMPORTED_LOCATION ${linux_lib_dir}/v8/libv8_monolith.a IMPORTED_LOCATION ${linux_lib_dir}/v8/libv8_monolith.a
) )
add_library(openal SHARED IMPORTED GLOBAL) add_library(openal STATIC IMPORTED GLOBAL)
set_target_properties(openal PROPERTIES set_target_properties(openal PROPERTIES
IMPORTED_LOCATION ${linux_lib_dir}/openal-soft/libopenal.so.1.21.1 IMPORTED_LOCATION ${linux_lib_dir}/openal-soft/libopenal.a
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/openal-soft INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/openal-soft
) )
@ -118,9 +118,9 @@ set_target_properties(tbb PROPERTIES
set(optional_libs_name ${optional_libs_name} tbb) set(optional_libs_name ${optional_libs_name} tbb)
endif() endif()
add_library(sdl2 SHARED IMPORTED GLOBAL) add_library(sdl2 STATIC IMPORTED GLOBAL)
set_target_properties(sdl2 PROPERTIES set_target_properties(sdl2 PROPERTIES
IMPORTED_LOCATION ${linux_lib_dir}/sdl2/libSDL2.so IMPORTED_LOCATION ${linux_lib_dir}/sdl2/libSDL2.a
INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/sdl2 INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/sdl2
) )
@ -177,8 +177,11 @@ list(APPEND CC_EXTERNAL_LIBS
png png
websockets websockets
webp webp
sdl2
curl curl
${optional_libs_name} ${optional_libs_name}
${glslang_libs_name} ${glslang_libs_name}
) )
if(NOT USE_SERVER_MODE)
list(APPEND CC_EXTERNAL_LIBS sdl2)
endif()

BIN
linux/lib/mpg123/libmpg123.a Normal file
View File

Binary file not shown.

BIN
linux/lib/openal-soft/libopenal.a Normal file
View File

Binary file not shown.

BIN
linux/lib/v8/libv8_monolith_custom_false.a Normal file
View File

Binary file not shown.

BIN
linux/lib/v8/libv8_monolith_custom_true.a Normal file
View File

Binary file not shown.

4
sources/boost-source/boost.cmake
View File

@ -7,10 +7,8 @@ set(BOOST_LIB_NAMES
foreach(lib ${BOOST_LIB_NAMES}) foreach(lib ${BOOST_LIB_NAMES})
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${lib} boost/${lib}) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${lib} boost/${lib})
target_compile_definitions(boost_${lib} PUBLIC BOOST_UUID_FORCE_AUTO_LINK)
set_target_properties(boost_${lib} PROPERTIES FOLDER Utils) set_target_properties(boost_${lib} PROPERTIES FOLDER Utils)
target_compile_definitions(boost_${lib} PUBLIC
BOOST_UUID_FORCE_AUTO_LINK
)
list(APPEND CC_EXTERNAL_LIBS boost_${lib}) list(APPEND CC_EXTERNAL_LIBS boost_${lib})
endforeach() endforeach()