public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- no more dependency on static/dynamic MSVC runtime type

This commit is contained in:
Dmytro Bogovych 2025-12-12 07:06:11 +03:00
parent ffd371d6e7
commit 186ec4ccb4
9 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CMakeLists.txt
View File

@ -26,8 +26,6 @@ set (OPENSSL_INCLUDE ${LIB_PLATFORM}/openssl/1.1/include)
message ("Using OpenSSL include files from ${OPENSSL_INCLUDE}") message ("Using OpenSSL include files from ${OPENSSL_INCLUDE}")
message ("Using OpenSSL libs: ${OPENSSL_SSL} and ${OPENSSL_CRYPTO}") message ("Using OpenSSL libs: ${OPENSSL_SSL} and ${OPENSSL_CRYPTO}")
include_directories(${OPENSSL_INCLUDE}) include_directories(${OPENSSL_INCLUDE})
message ("Using Opus include files: ${OPUS_INCLUDE}")
message ("Using Opus lib: ${OPUS_LIB}")
# Used defines for our project # Used defines for our project
set (DEFINES -DUSE_OPENSSL) set (DEFINES -DUSE_OPENSSL)
@ -330,8 +328,9 @@ add_subdirectory(${L}/g722)
add_subdirectory(${L}/speexdsp) add_subdirectory(${L}/speexdsp)
add_subdirectory(${L}/libsrtp) add_subdirectory(${L}/libsrtp)
add_subdirectory(${L}/webrtc) 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) gsmhr_codec g722_codec srtp3 resiprocate webrtc speexdsp)
if (USE_AMR_CODEC) if (USE_AMR_CODEC)
@ -378,4 +377,4 @@ target_include_directories(rtphone
) )
# For MSVC static builds # For MSVC static builds
set_property(TARGET rtphone PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # set_property(TARGET rtphone PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

2
src/libs/g722/CMakeLists.txt
View File

@ -13,5 +13,5 @@ set (G722_SOURCES
) )
add_library(g722_codec ${G722_SOURCES}) add_library(g722_codec ${G722_SOURCES})
set_property(TARGET g722_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # set_property(TARGET g722_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

2
src/libs/gsmhr/CMakeLists.txt
View File

@ -12,4 +12,4 @@ set (GSMHR_SOURCES
) )
add_library(gsmhr_codec ${GSMHR_SOURCES}) add_library(gsmhr_codec ${GSMHR_SOURCES})
set_property(TARGET gsmhr_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # set_property(TARGET gsmhr_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

3
src/libs/jrtplib/src/CMakeLists.txt
View File

@ -93,6 +93,5 @@ set(JRTPLIB_SOURCES
add_library(jrtplib STATIC ${JRTPLIB_SOURCES}) add_library(jrtplib STATIC ${JRTPLIB_SOURCES})
target_include_directories(jrtplib PUBLIC .) target_include_directories(jrtplib PUBLIC .)
set_property(TARGET jrtplib PROPERTY # set_property(TARGET jrtplib PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
target_include_directories(jrtplib PUBLIC .) target_include_directories(jrtplib PUBLIC .)

2
src/libs/libevs/CMakeLists.txt
View File

@ -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_dec
${CMAKE_CURRENT_SOURCE_DIR}/lib_com) ${CMAKE_CURRENT_SOURCE_DIR}/lib_com)
set_property(TARGET evs_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # set_property(TARGET evs_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

2
src/libs/libg729/CMakeLists.txt
View File

@ -37,4 +37,4 @@ set (G729_SOURCES
) )
add_library(g729_codec ${G729_SOURCES}) add_library(g729_codec ${G729_SOURCES})
set_property(TARGET g729_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # set_property(TARGET g729_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

2
src/libs/libgsm/CMakeLists.txt
View File

@ -26,4 +26,4 @@ set (GSM_SOURCES
add_library(gsm_codec ${GSM_SOURCES}) add_library(gsm_codec ${GSM_SOURCES})
target_include_directories(gsm_codec PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(gsm_codec PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(gsm_codec PUBLIC HAS_STDLIB_H HAS_STRING_H) target_compile_definitions(gsm_codec PUBLIC HAS_STDLIB_H HAS_STRING_H)
set_property(TARGET gsm_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # set_property(TARGET gsm_codec PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

2
src/libs/speexdsp/CMakeLists.txt
View File

@ -26,4 +26,4 @@ target_include_directories(speexdsp PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/libspeexdsp ${CMAKE_CURRENT_SOURCE_DIR}/libspeexdsp
${CMAKE_CURRENT_SOURCE_DIR}/include) ${CMAKE_CURRENT_SOURCE_DIR}/include)
set_property(TARGET speexdsp PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # set_property(TARGET speexdsp PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

2
src/libs/webrtc/CMakeLists.txt
View File

@ -180,4 +180,4 @@ target_include_directories(webrtc PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/utility ${CMAKE_CURRENT_SOURCE_DIR}/utility
) )
set_property(TARGET webrtc PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") # set_property(TARGET webrtc PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")