From 186ec4ccb49f3a3871db2e48ea08c381bd012986 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Fri, 12 Dec 2025 07:06:11 +0300 Subject: [PATCH] - no more dependency on static/dynamic MSVC runtime type --- src/CMakeLists.txt | 7 +++---- src/libs/g722/CMakeLists.txt | 2 +- src/libs/gsmhr/CMakeLists.txt | 2 +- src/libs/jrtplib/src/CMakeLists.txt | 3 +-- src/libs/libevs/CMakeLists.txt | 2 +- src/libs/libg729/CMakeLists.txt | 2 +- src/libs/libgsm/CMakeLists.txt | 2 +- src/libs/speexdsp/CMakeLists.txt | 2 +- src/libs/webrtc/CMakeLists.txt | 2 +- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc4aae9b..ce9e31b9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,8 +26,6 @@ set (OPENSSL_INCLUDE ${LIB_PLATFORM}/openssl/1.1/include) message ("Using OpenSSL include files from ${OPENSSL_INCLUDE}") message ("Using OpenSSL libs: ${OPENSSL_SSL} and ${OPENSSL_CRYPTO}") include_directories(${OPENSSL_INCLUDE}) -message ("Using Opus include files: ${OPUS_INCLUDE}") -message ("Using Opus lib: ${OPUS_LIB}") # Used defines for our project set (DEFINES -DUSE_OPENSSL) @@ -330,8 +328,9 @@ add_subdirectory(${L}/g722) add_subdirectory(${L}/speexdsp) add_subdirectory(${L}/libsrtp) add_subdirectory(${L}/webrtc) +add_subdirectory(${L}/opus) -set (LIBS_STATIC ${LIBS_STATIC} jrtplib g729_codec gsm_codec ${OPUS_LIB} +set (LIBS_STATIC ${LIBS_STATIC} jrtplib g729_codec gsm_codec opus gsmhr_codec g722_codec srtp3 resiprocate webrtc speexdsp) if (USE_AMR_CODEC) @@ -378,4 +377,4 @@ target_include_directories(rtphone ) # For MSVC static builds -set_property(TARGET rtphone PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# set_property(TARGET rtphone PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/g722/CMakeLists.txt b/src/libs/g722/CMakeLists.txt index 23ca1f26..c9eb5fce 100644 --- a/src/libs/g722/CMakeLists.txt +++ b/src/libs/g722/CMakeLists.txt @@ -13,5 +13,5 @@ set (G722_SOURCES ) add_library(g722_codec ${G722_SOURCES}) -set_property(TARGET g722_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# set_property(TARGET g722_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/gsmhr/CMakeLists.txt b/src/libs/gsmhr/CMakeLists.txt index fb25bde2..b6f5c081 100644 --- a/src/libs/gsmhr/CMakeLists.txt +++ b/src/libs/gsmhr/CMakeLists.txt @@ -12,4 +12,4 @@ set (GSMHR_SOURCES ) add_library(gsmhr_codec ${GSMHR_SOURCES}) -set_property(TARGET gsmhr_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# set_property(TARGET gsmhr_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/jrtplib/src/CMakeLists.txt b/src/libs/jrtplib/src/CMakeLists.txt index e96fc82a..c182a228 100644 --- a/src/libs/jrtplib/src/CMakeLists.txt +++ b/src/libs/jrtplib/src/CMakeLists.txt @@ -93,6 +93,5 @@ set(JRTPLIB_SOURCES add_library(jrtplib STATIC ${JRTPLIB_SOURCES}) target_include_directories(jrtplib PUBLIC .) -set_property(TARGET jrtplib PROPERTY - MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# set_property(TARGET jrtplib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") target_include_directories(jrtplib PUBLIC .) diff --git a/src/libs/libevs/CMakeLists.txt b/src/libs/libevs/CMakeLists.txt index f9b96a32..5ee00808 100644 --- a/src/libs/libevs/CMakeLists.txt +++ b/src/libs/libevs/CMakeLists.txt @@ -15,4 +15,4 @@ target_include_directories(evs_codec PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/basic_o ${CMAKE_CURRENT_SOURCE_DIR}/lib_dec ${CMAKE_CURRENT_SOURCE_DIR}/lib_com) -set_property(TARGET evs_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# set_property(TARGET evs_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/libg729/CMakeLists.txt b/src/libs/libg729/CMakeLists.txt index f7def763..9518d351 100644 --- a/src/libs/libg729/CMakeLists.txt +++ b/src/libs/libg729/CMakeLists.txt @@ -37,4 +37,4 @@ set (G729_SOURCES ) add_library(g729_codec ${G729_SOURCES}) -set_property(TARGET g729_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# set_property(TARGET g729_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/libgsm/CMakeLists.txt b/src/libs/libgsm/CMakeLists.txt index b248d40d..401cebab 100644 --- a/src/libs/libgsm/CMakeLists.txt +++ b/src/libs/libgsm/CMakeLists.txt @@ -26,4 +26,4 @@ set (GSM_SOURCES add_library(gsm_codec ${GSM_SOURCES}) target_include_directories(gsm_codec PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_compile_definitions(gsm_codec PUBLIC HAS_STDLIB_H HAS_STRING_H) -set_property(TARGET gsm_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# set_property(TARGET gsm_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/speexdsp/CMakeLists.txt b/src/libs/speexdsp/CMakeLists.txt index 4c03a8b1..768bf022 100644 --- a/src/libs/speexdsp/CMakeLists.txt +++ b/src/libs/speexdsp/CMakeLists.txt @@ -26,4 +26,4 @@ target_include_directories(speexdsp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libspeexdsp ${CMAKE_CURRENT_SOURCE_DIR}/include) -set_property(TARGET speexdsp PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# set_property(TARGET speexdsp PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") diff --git a/src/libs/webrtc/CMakeLists.txt b/src/libs/webrtc/CMakeLists.txt index 9407743a..842d355b 100644 --- a/src/libs/webrtc/CMakeLists.txt +++ b/src/libs/webrtc/CMakeLists.txt @@ -180,4 +180,4 @@ target_include_directories(webrtc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/utility ) -set_property(TARGET webrtc PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +# set_property(TARGET webrtc PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>")