- remove reference to 'libraries' submodule - its library binaries are outdated; we support OpenSSL 3.x already.
This commit is contained in:
parent
1a506862d2
commit
4c02805452
|
|
@ -1,3 +0,0 @@
|
|||
[submodule "src/libs/libraries"]
|
||||
path = src/libs/libraries
|
||||
url = git@git.sevana.biz:public/libraries.git
|
||||
|
|
@ -17,11 +17,11 @@ set (CMAKE_POSITION_INDEPENDENT_CODE ON)
|
|||
set (RUNTIME_CPU_CAPABILITY_DETECTION ON)
|
||||
|
||||
set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/libs/libraries)
|
||||
include (${LIB_PLATFORM}/platform_libs.cmake)
|
||||
#include (${LIB_PLATFORM}/platform_libs.cmake)
|
||||
|
||||
|
||||
message("Libraries: ${LIB_PLATFORM}")
|
||||
set (OPENSSL_INCLUDE ${LIB_PLATFORM}/openssl/1.1/include)
|
||||
# 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})
|
||||
|
|
@ -340,7 +340,7 @@ set (LIBS_STATIC ${LIBS_STATIC} jrtplib g729_codec gsm_codec opus
|
|||
gsmhr_codec g722_codec srtp3 resiprocate webrtc speexdsp)
|
||||
|
||||
if (USE_AMR_CODEC)
|
||||
include (${LIB_PLATFORM}/platform_libs.cmake)
|
||||
#include (${LIB_PLATFORM}/platform_libs.cmake)
|
||||
message("Media: AMR NB and WB codecs will be included.")
|
||||
set (DEFINES ${DEFINES} -DUSE_AMR_CODEC)
|
||||
set (LIBS_STATIC ${LIBS_STATIC} ${OPENCORE_AMRNB} ${OPENCORE_AMRWB})
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit e61d2dd0d9657bd833f3680142819ff8fe7cd61d
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
project (resiprocate)
|
||||
|
||||
if (NOT OPENSSL_INCLUDE)
|
||||
message(FATAL_ERROR "OPENSSL_INCLUDE has to be directory with OpenSSL 1.1.x include files.")
|
||||
endif()
|
||||
#if (NOT OPENSSL_INCLUDE)
|
||||
# message(FATAL_ERROR "OPENSSL_INCLUDE has to be directory with OpenSSL 1.1.x include files.")
|
||||
#endif()
|
||||
|
||||
# Rely on C++ 20
|
||||
set (CMAKE_CXX_STANDARD 20)
|
||||
|
|
|
|||
Loading…
Reference in New Issue