From f0467be10c955924be1550a4c15c1516ae309f5b Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 22 Jun 2016 17:25:46 +0200 Subject: [PATCH 1/5] Update ms2 submodule. --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index e7d1e3ca6..15e62e052 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit e7d1e3ca68df2d9d13c8aa813780b2074de15a96 +Subproject commit 15e62e05297c56f940f198b2f7be480c3437f4f4 From 2bfa0495b6d10d2b3bd14ffea26a8b940971c06a Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 22 Jun 2016 18:47:40 +0200 Subject: [PATCH 2/5] Remove obsolete and no longer maintained Visual Studio projects. --- build/wince/liblinphone.sln | 48 -- build/wince/liblinphone.vcproj | 585 ------------------------- build/wince/linphonec/linphonec.vcproj | 240 ---------- 3 files changed, 873 deletions(-) delete mode 100644 build/wince/liblinphone.sln delete mode 100644 build/wince/liblinphone.vcproj delete mode 100644 build/wince/linphonec/linphonec.vcproj diff --git a/build/wince/liblinphone.sln b/build/wince/liblinphone.sln deleted file mode 100644 index fe4efff27..000000000 --- a/build/wince/liblinphone.sln +++ /dev/null @@ -1,48 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinphone", "liblinphone.vcproj", "{290078F0-3B63-47BF-A2A9-E1AF5411F5E7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linphonec", "linphonec\linphonec.vcproj", "{92574924-BF59-4DAA-994B-9978B80E5797}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|Windows Mobile 6 Professional SDK (ARMV4I) = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - Debug|Windows Mobile 6 Standard SDK (ARMV4I) = Debug|Windows Mobile 6 Standard SDK (ARMV4I) - Release|Win32 = Release|Win32 - Release|Windows Mobile 6 Professional SDK (ARMV4I) = Release|Windows Mobile 6 Professional SDK (ARMV4I) - Release|Windows Mobile 6 Standard SDK (ARMV4I) = Release|Windows Mobile 6 Standard SDK (ARMV4I) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Win32.ActiveCfg = Debug|Win32 - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Win32.Build.0 = Debug|Win32 - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Standard SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Standard SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Win32.ActiveCfg = Release|Win32 - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Win32.Build.0 = Release|Win32 - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Standard SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I) - {290078F0-3B63-47BF-A2A9-E1AF5411F5E7}.Release|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Standard SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Win32.ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Win32.ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I) - {92574924-BF59-4DAA-994B-9978B80E5797}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I) - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/build/wince/liblinphone.vcproj b/build/wince/liblinphone.vcproj deleted file mode 100644 index 9909c8a1f..000000000 --- a/build/wince/liblinphone.vcproj +++ /dev/null @@ -1,585 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/wince/linphonec/linphonec.vcproj b/build/wince/linphonec/linphonec.vcproj deleted file mode 100644 index 058ce425c..000000000 --- a/build/wince/linphonec/linphonec.vcproj +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 8c5539406a9382c2d5a626360b5000cd3258fa8d Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 23 Jun 2016 13:24:55 +0200 Subject: [PATCH 3/5] Update ortp and ms2 submodules. --- mediastreamer2 | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mediastreamer2 b/mediastreamer2 index 15e62e052..d939b4667 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 15e62e05297c56f940f198b2f7be480c3437f4f4 +Subproject commit d939b46679603f7e8adf1590ad9f932814aad897 diff --git a/oRTP b/oRTP index f07032474..6a8d5ab7c 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit f070324740b210977e619e716feeb63df0a6d84e +Subproject commit 6a8d5ab7cb5de50c76b5b06478b1594f28b6119f From 103f7a60788f1a67f582a5a41fd9e9aa9308e3b4 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 23 Jun 2016 13:25:11 +0200 Subject: [PATCH 4/5] Do not include dependencies in the link interface when building a shared library. --- console/CMakeLists.txt | 12 +++++++++--- coreapi/CMakeLists.txt | 2 +- gtk/CMakeLists.txt | 2 +- tester/CMakeLists.txt | 20 +++++++++++++++----- tools/CMakeLists.txt | 4 ++-- 5 files changed, 28 insertions(+), 12 deletions(-) diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt index 078b4ee40..92016c04a 100644 --- a/console/CMakeLists.txt +++ b/console/CMakeLists.txt @@ -37,15 +37,21 @@ if(MSVC) endif() add_executable(linphonec ${LINPHONEC_SOURCE_FILES}) -target_link_libraries(linphonec linphone) +target_link_libraries(linphonec linphone ${BCTOOLBOX_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}) +if(INTL_FOUND) + target_link_libraries(linphonec ${INTL_LIBRARIES}) +endif() if(WIN32) add_executable(linphoned WIN32 ${LINPHONEC_SOURCE_FILES}) - target_link_libraries(linphoned linphone) + target_link_libraries(linphoned linphone ${BCTOOLBOX_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}) + if(INTL_FOUND) + target_link_libraries(linphoned ${INTL_LIBRARIES}) + endif() endif() add_executable(linphonecsh ${LINPHONECSH_SOURCE_FILES}) -target_link_libraries(linphonecsh linphone) +target_link_libraries(linphonecsh linphone ${ORTP_LIBRARIES}) set(INSTALL_TARGETS linphonec linphonecsh) if(WIN32) diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index b2653469e..de85a6fe6 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -230,7 +230,7 @@ if(ENABLE_SHARED) set_target_properties(linphone PROPERTIES SOVERSION ${LINPHONE_SO_VERSION}) endif() add_dependencies(linphone liblinphone-git-version) - target_link_libraries(linphone ${LIBS}) + target_link_libraries(linphone PRIVATE ${LIBS}) if(WIN32 AND CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set_target_properties(linphone PROPERTIES PREFIX "lib") elseif(ANDROID) diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index aa04fdcce..75064ea28 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -94,7 +94,7 @@ else() endif() set_target_properties(linphone-gtk PROPERTIES OUTPUT_NAME linphone LINKER_LANGUAGE CXX) target_include_directories(linphone-gtk PUBLIC ${GTK2_INCLUDE_DIRS} ${INTL_INCLUDE_DIRS}) -target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES}) +target_link_libraries(linphone-gtk linphone ${GTK2_LIBRARIES} ${BCTOOLBOX_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}) if(INTL_FOUND) target_link_libraries(linphone-gtk ${INTL_LIBRARIES}) endif() diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt index 10a2668f2..1ea1bf47f 100644 --- a/tester/CMakeLists.txt +++ b/tester/CMakeLists.txt @@ -21,9 +21,19 @@ ############################################################################ if(ENABLE_STATIC) - set(LINPHONE_LIBS_FOR_TOOLS linphone-static) + set(LINPHONE_LIBS_FOR_TESTER linphone-static) else() - set(LINPHONE_LIBS_FOR_TOOLS linphone) + set(LINPHONE_LIBS_FOR_TESTER linphone) +endif() +set(OTHER_LIBS_FOR_TESTER ${BCTOOLBOX_LIBRARIES} ${BCTOOLBOX_TESTER_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES} ${BELLESIP_LIBRARIES} ${XML2_LIBRARIES}) +if(INTL_FOUND) + list(APPEND OTHER_LIBS_FOR_TESTER ${INTL_LIBRARIES}) +endif() +if(SQLITE3_FOUND) + list(APPEND OTHER_LIBS_FOR_TESTER ${SQLITE3_LIBRARIES}) +endif() +if(ZLIB_FOUND) + list(APPEND OTHER_LIBS_FOR_TESTER ${ZLIB_LIBRARIES}) endif() set(RESOURCES_FILES @@ -80,7 +90,7 @@ if(ANDROID OR IOS) add_library(linphonetester STATIC ${SOURCE_FILES_C}) endif() target_include_directories(linphonetester PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS}) - target_link_libraries(linphonetester linphone ${BCTOOLBOX_TESTER_LIBRARIES}) + target_link_libraries(linphonetester linphone ${OTHER_LIBS_FOR_TESTER}) install(TARGETS linphonetester RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -94,7 +104,7 @@ if(ANDROID OR IOS) elseif(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") add_library(linphone_tester_static STATIC ${SOURCE_FILES_C}) target_include_directories(linphone_tester_static PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS}) - target_link_libraries(linphone_tester_static linphone ${BCTOOLBOX_TESTER_LIBRARIES}) + target_link_libraries(linphone_tester_static linphone ${OTHER_LIBS_FOR_TESTER}) set(RUNTIME_COMPONENT_SOURCES liblinphone_tester_windows.cpp @@ -133,7 +143,7 @@ if (NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") endif() set_target_properties(liblinphone_tester PROPERTIES LINKER_LANGUAGE CXX) target_include_directories(liblinphone_tester PUBLIC ${BCTOOLBOX_TESTER_INCLUDE_DIRS}) - target_link_libraries(liblinphone_tester ${LINPHONE_LIBS_FOR_TOOLS} ${BCTOOLBOX_TESTER_LIBRARIES}) + target_link_libraries(liblinphone_tester ${LINPHONE_LIBS_FOR_TESTER} ${OTHER_LIBS_FOR_TESTER}) if (GTK2_FOUND) target_compile_definitions(liblinphone_tester PRIVATE HAVE_GTK) target_include_directories(liblinphone_tester PUBLIC ${GTK2_INCLUDE_DIRS}) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 0a871aba5..0438c6eba 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -65,7 +65,7 @@ add_definitions( apply_compile_flags(LP_AUTO_ANSWER_SOURCE_FILES "CPP" "C") add_executable(lp-auto-answer ${LP_AUTO_ANSWER_SOURCE_FILES}) -target_link_libraries(lp-auto-answer linphone) +target_link_libraries(lp-auto-answer linphone ${BCTOOLBOX_LIBRARIES} ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}) install(TARGETS lp-auto-answer @@ -85,7 +85,7 @@ add_definitions( apply_compile_flags(LP_SENDMSG_SOURCE_FILES "CPP" "C") add_executable(lp-sendmsg ${LP_SENDMSG_SOURCE_FILES}) -target_link_libraries(lp-sendmsg linphone) +target_link_libraries(lp-sendmsg linphone ${ORTP_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}) install(TARGETS lp-sendmsg From 6a56550a8182fc90b7de147dba117b57476ef7f6 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 23 Jun 2016 13:53:26 +0200 Subject: [PATCH 5/5] Fix build of daemon with CMake. --- daemon/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index 8d2fbc8df..bdd7f6d6f 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -114,10 +114,10 @@ apply_compile_flags(DAEMON_PIPETEST_SOURCE_FILES "CPP" "C") add_executable(linphone-daemon ${DAEMON_SOURCE_FILES}) target_include_directories(linphone-daemon PRIVATE ${CMAKE_CURRENT_LIST_DIR}) -target_link_libraries(linphone-daemon linphone) +target_link_libraries(linphone-daemon linphone ${MEDIASTREAMER2_LIBRARIES}) add_executable(linphone-daemon-pipetest ${DAEMON_PIPETEST_SOURCE_FILES}) -target_link_libraries(linphone-daemon-pipetest linphone) +target_link_libraries(linphone-daemon-pipetest linphone ${ORTP_LIBRARIES}) set(INSTALL_TARGETS linphone-daemon linphone-daemon-pipetest)