Commit 50c96337 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Build a single mediastreamer library (instead of mediastreamer_base and...

Build a single mediastreamer library (instead of mediastreamer_base and mediastreamer_voip) and a single mediastreamer2 framework for iOS.
parent 7d116ce6
Pipeline #431 failed with stage
in 0 seconds
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>mediastreamer_base</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_FRAMEWORK_IDENTIFIER}</string>
<key>LSMinimumSystemVersion</key>
<string>${MIN_OS}</string>
<key>MinimumOSVersion</key>
<string>${MIN_OS}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>${MEDIASTREAMER_VERSION}</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${MEDIASTREAMER_VERSION}</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict>
</plist>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>mediastreamer_voip</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_FRAMEWORK_IDENTIFIER}</string>
<key>LSMinimumSystemVersion</key>
<string>${MIN_OS}</string>
<key>MinimumOSVersion</key>
<string>${MIN_OS}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>${MEDIASTREAMER_VERSION}</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${MEDIASTREAMER_VERSION}</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict>
</plist>
\ No newline at end of file
......@@ -34,26 +34,16 @@ if(NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
endif()
if(@ENABLE_SHARED@)
set(MEDIASTREAMER2_TARGETNAME mediastreamer_voip)
set(MEDIASTREAMER2_LIBRARIES ${MEDIASTREAMER2_TARGETNAME} mediastreamer_base)
set(MEDIASTREAMER2_TARGETNAME mediastreamer)
set(MEDIASTREAMER2_LIBRARIES ${MEDIASTREAMER2_TARGETNAME})
else()
set(MEDIASTREAMER2_TARGETNAME mediastreamer_voip-static)
set(MEDIASTREAMER2_TARGETNAME mediastreamer-static)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
set(MEDIASTREAMER2_LIBRARIES ${MEDIASTREAMER2_TARGETNAME})
else()
get_target_property(MEDIASTREAMER2_LIBRARIES ${MEDIASTREAMER2_TARGETNAME} LOCATION)
endif()
get_target_property(MEDIASTREAMER2_LINK_LIBRARIES ${MEDIASTREAMER2_TARGETNAME} INTERFACE_LINK_LIBRARIES)
if(MEDIASTREAMER2_LINK_LIBRARIES)
list(APPEND MEDIASTREAMER2_LIBRARIES ${MEDIASTREAMER2_LINK_LIBRARIES})
list(REMOVE_ITEM MEDIASTREAMER2_LIBRARIES mediastreamer_base-static)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
set(MEDIASTREAMER2_BASE_LIBRARIES mediastreamer_base-static)
else()
get_target_property(MEDIASTREAMER2_BASE_LIBRARIES mediastreamer_base-static LOCATION)
endif()
list(APPEND MEDIASTREAMER2_LIBRARIES ${MEDIASTREAMER2_BASE_LIBRARIES})
endif()
get_target_property(MEDIASTREAMER2_LIBRARIES ${MEDIASTREAMER2_TARGETNAME} INTERFACE_LINK_LIBRARIES)
endif()
get_target_property(MEDIASTREAMER2_INCLUDE_DIRS ${MEDIASTREAMER2_TARGETNAME} INTERFACE_INCLUDE_DIRECTORIES)
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
......
......@@ -65,13 +65,6 @@ endif()
bc_git_version(ms2 ${PROJECT_VERSION})
add_custom_target(ms2-basedescs-header
COMMAND ${CMAKE_COMMAND} -DAWK_PROGRAM=${AWK_PROGRAM} -DAWK_SCRIPTS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../"
-DINPUT_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}
-DTYPE=base -DSOURCE_FILES="${BASE_SOURCE_FILES_C}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/generate_descs_header.cmake"
BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/basedescs.h")
add_definitions(
-D_TRUE_TIME
-DMS2_EXPORTS
......@@ -80,71 +73,6 @@ add_definitions(
-DBCTBX_LOG_DOMAIN="mediastreamer"
)
set(BASE_LIBS
${BCTOOLBOX_CORE_LIBRARIES} ${ORTP_LIBRARIES}
)
if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
list(APPEND BASE_LIBS ${LIBGCC} ${LIBMINGWEX} ole32 oleaut32 uuid Winmm Ws2_32)
endif()
if(HAVE_DLOPEN)
list(APPEND BASE_LIBS dl)
endif()
bc_apply_compile_flags(BASE_SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
if(ENABLE_STATIC)
add_library(mediastreamer_base-static STATIC ${MEDIASTREAMER2_HEADER_FILES} ${BASE_SOURCE_FILES_C})
set_target_properties(mediastreamer_base-static PROPERTIES OUTPUT_NAME mediastreamer_base)
target_include_directories(mediastreamer_base-static PUBLIC ${MEDIASTREAMER2_INCLUDE_DIRS})
target_link_libraries(mediastreamer_base-static INTERFACE ${BASE_LIBS})
add_dependencies(mediastreamer_base-static ms2-git-version ms2-basedescs-header)
install(TARGETS mediastreamer_base-static EXPORT ${EXPORT_TARGETS_NAME}Targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif()
if(ENABLE_SHARED)
add_library(mediastreamer_base SHARED ${MEDIASTREAMER2_HEADER_FILES} ${BASE_SOURCE_FILES_C})
set_target_properties(mediastreamer_base PROPERTIES LINKER_LANGUAGE CXX)
#TODO: replace by if(APPLE) when we want to make apple framework on linphone-desktop too
if(IOS)
if(IOS)
set(MIN_OS ${LINPHONE_IOS_DEPLOYMENT_TARGET})
else()
set(MIN_OS ${CMAKE_OSX_DEPLOYMENT_TARGET})
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/osx/")
set_target_properties(mediastreamer_base PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_IDENTIFIER org.linphone.mediastreamerbase
MACOSX_FRAMEWORK_INFO_PLIST Info_base.plist.in
)
endif()
if(NOT ANDROID)
# Do not version shared library on Android
set_target_properties(mediastreamer_base PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION})
endif()
target_include_directories(mediastreamer_base PUBLIC ${MEDIASTREAMER2_INCLUDE_DIRS})
target_link_libraries(mediastreamer_base PRIVATE ${BASE_LIBS})
add_dependencies(mediastreamer_base ms2-git-version ms2-basedescs-header)
if(MSVC)
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/mediastreamer_base.pdb
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif()
endif()
install(TARGETS mediastreamer_base EXPORT ${EXPORT_TARGETS_NAME}Targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
FRAMEWORK DESTINATION Frameworks
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif()
set(VOIP_SOURCE_FILES_C
audiofilters/alaw.c
......@@ -479,7 +407,20 @@ endif()
if(PCAP_FOUND)
list(APPEND VOIP_SOURCE_FILES_C otherfilters/mspcapfileplayer.c)
endif()
set(VOIP_SOURCE_FILES_ALL ${VOIP_SOURCE_FILES_C} ${VOIP_SOURCE_FILES_CXX} ${VOIP_SOURCE_FILES_OBJC})
if(ENABLE_VIDEO)
add_subdirectory(voip/h26x)
endif()
set(VOIP_SOURCE_FILES_ALL ${VOIP_SOURCE_FILES_C} ${VOIP_SOURCE_FILES_CXX} ${VOIP_SOURCE_FILES_OBJC} ${VOIP_SOURCE_FILES_ASM})
set(SOURCE_FILES_ALL ${BASE_SOURCE_FILES_C} ${VOIP_SOURCE_FILES_ALL})
add_custom_target(ms2-basedescs-header
COMMAND ${CMAKE_COMMAND} -DAWK_PROGRAM=${AWK_PROGRAM} -DAWK_SCRIPTS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../"
-DINPUT_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}
-DTYPE=base -DSOURCE_FILES="${BASE_SOURCE_FILES_C}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/generate_descs_header.cmake"
BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/basedescs.h")
add_custom_target(ms2-voipdescs-header
COMMAND ${CMAKE_COMMAND} -DAWK_PROGRAM=${AWK_PROGRAM} -DAWK_SCRIPTS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../"
......@@ -511,10 +452,7 @@ if(APPLE OR ANDROID OR OPENGL_FOUND OR GLX_FOUND OR QTANGLE_FOUND)
)
endif()
if(ENABLE_VIDEO)
add_subdirectory(voip/h26x)
endif()
bc_apply_compile_flags(BASE_SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
bc_apply_compile_flags(VOIP_SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
bc_apply_compile_flags(VOIP_SOURCE_FILES_OBJC STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC)
if(VOIP_SOURCE_FILES_CXX)
......@@ -661,33 +599,33 @@ if(BCG729_FOUND)
endif()
list(APPEND VOIP_LIBS ${BCG729_LIBRARIES})
endif()
set(MS2_VOIP_DEPENDENCIES ms2-git-version ms2-voipdescs-header)
set(MS2_DEPENDENCIES ms2-git-version ms2-basedescs-header ms2-voipdescs-header)
if(APPLE OR ANDROID OR OPENGL_FOUND OR GLX_FOUND OR QTANGLE_FOUND)
list(APPEND MS2_VOIP_DEPENDENCIES ms2-yuv2rgb-fs-header ms2-yuv2rgb-vs-header)
list(APPEND MS2_DEPENDENCIES ms2-yuv2rgb-fs-header ms2-yuv2rgb-vs-header)
endif()
string(REPLACE ";" " " LINK_FLAGS_STR "${LINK_FLAGS}")
if(ENABLE_STATIC)
add_library(mediastreamer_voip-static STATIC ${MEDIASTREAMER2_HEADER_FILES} ${VOIP_SOURCE_FILES_C} ${VOIP_SOURCE_FILES_CXX} ${VOIP_SOURCE_FILES_OBJC} ${VOIP_SOURCE_FILES_ASM})
set_target_properties(mediastreamer_voip-static PROPERTIES OUTPUT_NAME mediastreamer_voip)
add_library(mediastreamer-static STATIC ${MEDIASTREAMER2_HEADER_FILES} ${SOURCE_FILES_ALL})
set_target_properties(mediastreamer-static PROPERTIES OUTPUT_NAME mediastreamer)
if(LINK_FLAGS_STR)
set_target_properties(mediastreamer_voip-static PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
set_target_properties(mediastreamer-static PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
endif()
add_dependencies(mediastreamer_voip-static ${MS2_VOIP_DEPENDENCIES})
target_include_directories(mediastreamer_voip-static PUBLIC ${MEDIASTREAMER2_INCLUDE_DIRS})
target_link_libraries(mediastreamer_voip-static INTERFACE mediastreamer_base-static ${VOIP_LIBS})
install(TARGETS mediastreamer_voip-static EXPORT ${EXPORT_TARGETS_NAME}Targets
add_dependencies(mediastreamer-static ${MS2_DEPENDENCIES})
target_include_directories(mediastreamer-static PUBLIC ${MEDIASTREAMER2_INCLUDE_DIRS})
target_link_libraries(mediastreamer-static INTERFACE ${VOIP_LIBS})
install(TARGETS mediastreamer-static EXPORT ${EXPORT_TARGETS_NAME}Targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif()
if(ENABLE_SHARED)
add_library(mediastreamer_voip SHARED ${MEDIASTREAMER2_HEADER_FILES} ${VOIP_SOURCE_FILES_C} ${VOIP_SOURCE_FILES_CXX} ${VOIP_SOURCE_FILES_OBJC} ${VOIP_SOURCE_FILES_ASM})
set_target_properties(mediastreamer_voip PROPERTIES LINKER_LANGUAGE CXX)
add_library(mediastreamer SHARED ${MEDIASTREAMER2_HEADER_FILES} ${SOURCE_FILES_ALL})
set_target_properties(mediastreamer PROPERTIES LINKER_LANGUAGE CXX)
if(LINK_FLAGS_STR)
set_target_properties(mediastreamer_voip PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
set_target_properties(mediastreamer PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
endif()
add_dependencies(mediastreamer_voip ${MS2_VOIP_DEPENDENCIES})
add_dependencies(mediastreamer ${MS2_DEPENDENCIES})
#TODO: replace by if(APPLE) when we want to make apple framework on linphone-desktop too
if(IOS)
if(IOS)
......@@ -696,34 +634,39 @@ if(ENABLE_SHARED)
set(MIN_OS ${CMAKE_OSX_DEPLOYMENT_TARGET})
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/osx/")
set_target_properties(mediastreamer_voip PROPERTIES
# According to Apple documentation (https://developer.apple.com/library/content/documentation/MacOSX/Conceptual/BPFrameworks/Tasks/IncludingFrameworks.html),
# framework header files must be included in application code using the #include directive using the followin patern: #include <Framework_name/Header_filename.h>,
# so name the framework mediastreamer2 instead of mediastreamer.
set_target_properties(mediastreamer PROPERTIES OUTPUT_NAME mediastreamer2)
set_target_properties(mediastreamer PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_IDENTIFIER org.linphone.mediastreamervoip
MACOSX_FRAMEWORK_INFO_PLIST Info_voip.plist.in
MACOSX_FRAMEWORK_IDENTIFIER org.linphone.mediastreamer2
MACOSX_FRAMEWORK_INFO_PLIST Info.plist.in
PUBLIC_HEADER "${MEDIASTREAMER2_HEADER_FILES}"
)
endif()
if(ANDROID)
if(ENABLE_VPX)
set_target_properties(mediastreamer_voip PROPERTIES LINK_FLAGS "-Wl,--exclude-libs,libvpx.a")
set_target_properties(mediastreamer PROPERTIES LINK_FLAGS "-Wl,--exclude-libs,libvpx.a")
endif()
else()
# Do not version shared library on Android
set_target_properties(mediastreamer_voip PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION})
set_target_properties(mediastreamer PROPERTIES SOVERSION ${MEDIASTREAMER_SO_VERSION})
endif()
target_include_directories(mediastreamer_voip PUBLIC ${MEDIASTREAMER2_INCLUDE_DIRS})
target_link_libraries(mediastreamer_voip PRIVATE mediastreamer_base ${VOIP_LIBS})
target_include_directories(mediastreamer PUBLIC ${MEDIASTREAMER2_INCLUDE_DIRS})
target_link_libraries(mediastreamer PRIVATE ${VOIP_LIBS})
if(IOS)
target_link_libraries(mediastreamer_voip INTERFACE "-framework Foundation" "-framework AVFoundation")
target_link_libraries(mediastreamer INTERFACE "-framework Foundation" "-framework AVFoundation")
endif()
if(MSVC)
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/mediastreamer_voip.pdb
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/mediastreamer.pdb
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif()
endif()
install(TARGETS mediastreamer_voip EXPORT ${EXPORT_TARGETS_NAME}Targets
install(TARGETS mediastreamer EXPORT ${EXPORT_TARGETS_NAME}Targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
......@@ -731,29 +674,6 @@ if(ENABLE_SHARED)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif()
if (ENABLE_SHARED AND IOS)
#According to Apple documentation (https://developer.apple.com/library/content/documentation/MacOSX/Conceptual/BPFrameworks/Tasks/IncludingFrameworks.html)
#Framework header files must be included in application code using the #include directive using the followin patern: #include <Framework_name/Header_filename.h>. Consequece for medistreamer2 is that the framework must be named mediastreamer2. The final solution is to replace both mediastreamer_voip and mediastreamer_base by mediastreamer2. To preserve backward compatibility, both mediastreamer_voip and mediastreamer_base are kept for now (2018-05-06)
add_library(mediastreamer2 SHARED ${MEDIASTREAMER2_HEADER_FILES})
set_target_properties(mediastreamer2 PROPERTIES LINKER_LANGUAGE CXX)
add_dependencies(mediastreamer2 mediastreamer_voip)
target_link_libraries(mediastreamer2 INTERFACE "-framework mediastreamer_base" "-framework mediastreamer_voip" "-framework Foundation" "-framework Foundation" "-framework AVFoundation")
set_target_properties(mediastreamer2 PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_IDENTIFIER org.linphone.mediastreamer
MACOSX_FRAMEWORK_INFO_PLIST Info.plist.in
PUBLIC_HEADER "${MEDIASTREAMER2_HEADER_FILES}"
)
install(TARGETS mediastreamer2 EXPORT ${EXPORT_TARGETS_NAME}Targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
FRAMEWORK DESTINATION Frameworks
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif()
if(FFMPEG_FOUND AND NOT WIN32)
set(NO_DEPRECATED_DECLARATIONS_SOURCE_FILES
......
......@@ -21,9 +21,9 @@
############################################################################
if(ENABLE_SHARED)
set(MS2_LIBS_FOR_TESTER mediastreamer_voip mediastreamer_base)
set(MS2_LIBS_FOR_TESTER mediastreamer)
else()
set(MS2_LIBS_FOR_TESTER mediastreamer_voip-static mediastreamer_base-static)
set(MS2_LIBS_FOR_TESTER mediastreamer-static)
if(XV_FOUND)
list(APPEND MS2_LIBS_FOR_TESTER Xext)
endif()
......
......@@ -28,9 +28,9 @@ if (IOS)
endif()
if(ENABLE_SHARED)
set(MS2_LIBS_FOR_TOOLS mediastreamer_voip mediastreamer_base)
set(MS2_LIBS_FOR_TOOLS mediastreamer)
else()
set(MS2_LIBS_FOR_TOOLS mediastreamer_voip-static mediastreamer_base-static)
set(MS2_LIBS_FOR_TOOLS mediastreamer-static)
if(XV_FOUND)
list(APPEND MS2_LIBS_FOR_TOOLS Xext)
endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment