- remove commented MSVC runtime library related code
This commit is contained in:
@@ -388,9 +388,6 @@ target_include_directories(rtphone
|
|||||||
${L}/libs/json
|
${L}/libs/json
|
||||||
)
|
)
|
||||||
|
|
||||||
# For MSVC static builds
|
|
||||||
# set_property(TARGET rtphone PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
|
||||||
|
|
||||||
find_package(OpenSSL REQUIRED)
|
find_package(OpenSSL REQUIRED)
|
||||||
target_link_libraries(rtphone PUBLIC OpenSSL::SSL)
|
target_link_libraries(rtphone PUBLIC OpenSSL::SSL)
|
||||||
target_link_libraries(rtphone PUBLIC OpenSSL::Crypto)
|
target_link_libraries(rtphone PUBLIC OpenSSL::Crypto)
|
||||||
|
|||||||
@@ -13,5 +13,4 @@ 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>")
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,4 +12,3 @@ 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>")
|
|
||||||
|
|||||||
@@ -93,5 +93,4 @@ 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 MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
|
||||||
target_include_directories(jrtplib PUBLIC .)
|
target_include_directories(jrtplib PUBLIC .)
|
||||||
|
|||||||
@@ -14,5 +14,3 @@ target_include_directories(evs_codec PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/basic_o
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/lib_enc
|
${CMAKE_CURRENT_SOURCE_DIR}/lib_enc
|
||||||
${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>")
|
|
||||||
|
|||||||
@@ -37,4 +37,3 @@ 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>")
|
|
||||||
|
|||||||
@@ -26,4 +26,3 @@ 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>")
|
|
||||||
|
|||||||
@@ -271,14 +271,6 @@ if(OPUS_CUSTOM_MODES)
|
|||||||
list(APPEND Opus_PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_custom.h)
|
list(APPEND Opus_PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/include/opus_custom.h)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MSVC)
|
|
||||||
if(OPUS_STATIC_RUNTIME)
|
|
||||||
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
|
||||||
else()
|
|
||||||
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_library(opus ${opus_headers} ${opus_sources} ${opus_sources_float} ${Opus_PUBLIC_HEADER})
|
add_library(opus ${opus_headers} ${opus_sources} ${opus_sources_float} ${Opus_PUBLIC_HEADER})
|
||||||
add_library(Opus::opus ALIAS opus)
|
add_library(Opus::opus ALIAS opus)
|
||||||
|
|
||||||
|
|||||||
@@ -25,5 +25,3 @@ target_compile_definitions(speexdsp PUBLIC -DUSE_KISS_FFT -DFLOATING_POINT -DHAV
|
|||||||
target_include_directories(speexdsp PUBLIC
|
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>")
|
|
||||||
|
|||||||
@@ -179,5 +179,3 @@ target_include_directories(webrtc PUBLIC
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/signal_processing_library
|
${CMAKE_CURRENT_SOURCE_DIR}/signal_processing_library
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/utility
|
${CMAKE_CURRENT_SOURCE_DIR}/utility
|
||||||
)
|
)
|
||||||
|
|
||||||
# set_property(TARGET webrtc PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
|
||||||
|
|||||||
Reference in New Issue
Block a user