amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 04:31:37 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

cmake: 库列表名称变更

Browse Source
This commit is contained in:
Xiaofeng Wang 2022-07-25 13:54:24 +08:00
parent d850846612
commit 0b33769ee9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android/app/src/main/cpp/CMakeLists.txt
View File

@ -36,5 +36,5 @@ file(GLOB JNI_src_list ${JNI_Root}/*.cpp ${JNI_Root}/*.h)
add_library(zlmediakit_jni SHARED ${JNI_src_list}) add_library(zlmediakit_jni SHARED ${JNI_src_list})
#链接 #链接
target_link_libraries(zlmediakit_jni -Wl,--start-group log z ${LINK_LIB_LIST} -Wl,--end-group) target_link_libraries(zlmediakit_jni -Wl,--start-group log z ${MK_LINK_LIBRARIES} -Wl,--end-group)

5
CMakeLists.txt
View File

@ -419,6 +419,11 @@ if(NOT IOS)
endif() endif()
add_subdirectory(server) add_subdirectory(server)
# Android 会 add_subdirectory 并依赖该变量
if(ENABLE_SERVER_LIB)
set(MK_LINK_LIBRARIES ${MK_LINK_LIBRARIES} PARENT_SCOPE)
endif()
# 复制文件过来 # 复制文件过来
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/www" file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/www"
DESTINATION ${EXECUTABLE_OUTPUT_PATH}) DESTINATION ${EXECUTABLE_OUTPUT_PATH})