Compare commits

...
4 Commits
Author SHA1 Message Date
yangchaoandGitHub 349eed9b0b fix :sdl2 use static link (#224) 2022-02-28 09:45:47 +08:00
yangchaoandGitHub 973e244526 fix : linux use static lib (#223) 2022-02-25 15:32:45 +08:00
yangchaoandGitHub f28eba4d2f Server mode not link sdl2 (#221) 2022-02-24 14:49:47 +08:00
Yun Hsiao WuandGitHub 5088645437 fix merge error (#220) 2022-02-08 11:00:37 +08:00
6 changed files with 15 additions and 16 deletions
+14 -11
View File
@@ -9,9 +9,9 @@ set_target_properties(uv PROPERTIES
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
IMPORTED_LOCATION ${linux_lib_dir}/mpg123/libmpg123.so
IMPORTED_LOCATION ${linux_lib_dir}/mpg123/libmpg123.a
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
)
add_library(libz SHARED IMPORTED GLOBAL)
add_library(libz STATIC IMPORTED GLOBAL)
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
)
add_library(sqlite3 SHARED IMPORTED GLOBAL)
add_library(sqlite3 STATIC IMPORTED GLOBAL)
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
)
@@ -49,9 +49,9 @@ set_target_properties(v8 PROPERTIES
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
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
)
@@ -118,9 +118,9 @@ set_target_properties(tbb PROPERTIES
set(optional_libs_name ${optional_libs_name} tbb)
endif()
add_library(sdl2 SHARED IMPORTED GLOBAL)
add_library(sdl2 STATIC IMPORTED GLOBAL)
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
)
@@ -177,8 +177,11 @@ list(APPEND CC_EXTERNAL_LIBS
png
websockets
webp
sdl2
curl
${optional_libs_name}
${glslang_libs_name}
)
if(NOT USE_SERVER_MODE)
list(APPEND CC_EXTERNAL_LIBS sdl2)
endif()
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -5
View File
@@ -7,11 +7,7 @@ set(BOOST_LIB_NAMES
foreach(lib ${BOOST_LIB_NAMES})
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)
list(APPEND CC_EXTERNAL_LIBS boost_${lib})
foreach(lib ${BOOST_LIBS})
set_target_properties(${lib} PROPERTIES FOLDER Utils)
target_compile_definitions(${lib} PUBLIC
BOOST_UUID_FORCE_AUTO_LINK
)
endforeach()