- remove reference to 'libraries' submodule - its library binaries are outdated; we support OpenSSL 3.x already.
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -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 (RUNTIME_CPU_CAPABILITY_DETECTION ON)
|
||||||
|
|
||||||
set (LIB_PLATFORM ${CMAKE_CURRENT_SOURCE_DIR}/libs/libraries)
|
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}")
|
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 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})
|
||||||
@@ -340,7 +340,7 @@ 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)
|
||||||
include (${LIB_PLATFORM}/platform_libs.cmake)
|
#include (${LIB_PLATFORM}/platform_libs.cmake)
|
||||||
message("Media: AMR NB and WB codecs will be included.")
|
message("Media: AMR NB and WB codecs will be included.")
|
||||||
set (DEFINES ${DEFINES} -DUSE_AMR_CODEC)
|
set (DEFINES ${DEFINES} -DUSE_AMR_CODEC)
|
||||||
set (LIBS_STATIC ${LIBS_STATIC} ${OPENCORE_AMRNB} ${OPENCORE_AMRWB})
|
set (LIBS_STATIC ${LIBS_STATIC} ${OPENCORE_AMRNB} ${OPENCORE_AMRWB})
|
||||||
|
|||||||
Submodule src/libs/libraries deleted from e61d2dd0d9
@@ -1,8 +1,8 @@
|
|||||||
project (resiprocate)
|
project (resiprocate)
|
||||||
|
|
||||||
if (NOT OPENSSL_INCLUDE)
|
#if (NOT OPENSSL_INCLUDE)
|
||||||
message(FATAL_ERROR "OPENSSL_INCLUDE has to be directory with OpenSSL 1.1.x include files.")
|
# message(FATAL_ERROR "OPENSSL_INCLUDE has to be directory with OpenSSL 1.1.x include files.")
|
||||||
endif()
|
#endif()
|
||||||
|
|
||||||
# Rely on C++ 20
|
# Rely on C++ 20
|
||||||
set (CMAKE_CXX_STANDARD 20)
|
set (CMAKE_CXX_STANDARD 20)
|
||||||
|
|||||||
Reference in New Issue
Block a user