From 19e1a65abbea5cb43da2d9f492ba92a6ccbdc473 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Wed, 12 Jun 2019 12:38:39 +0300 Subject: [PATCH] - fixes for Linux CI build --- src/CMakeLists.txt | 1 + src/libs/speexdsp/CMakeLists.txt | 2 +- src/libs/srtp/CMakeLists.txt | 8 ++++++++ src/libs/srtp/crypto/include/integers.h | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a7dd5f11..31461b43 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -141,6 +141,7 @@ set (RTPHONE_HEADERS add_library(rtphone STATIC ${RTPHONE_SOURCES} ${RTPHONE_HEADERS}) +include_directories(BEFORE SYSTEM ${OPENSSL_INCLUDE}) add_subdirectory(${rtphone_libs}/resiprocate) add_subdirectory(${rtphone_libs}/ice) add_subdirectory(${rtphone_libs}/jrtplib/src) diff --git a/src/libs/speexdsp/CMakeLists.txt b/src/libs/speexdsp/CMakeLists.txt index 5b1a2bab..09924c5d 100644 --- a/src/libs/speexdsp/CMakeLists.txt +++ b/src/libs/speexdsp/CMakeLists.txt @@ -20,7 +20,7 @@ set (SPEEXDSP_SOURCES ) add_library(speexdsp ${SPEEXDSP_SOURCES}) -target_compile_definitions(speexdsp PUBLIC -DUSE_KISS_FFT -DFIXED_POINT) +target_compile_definitions(speexdsp PUBLIC -DUSE_KISS_FFT -DFIXED_POINT -DHAVE_STDINT_H) target_include_directories(speexdsp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libspeexdsp diff --git a/src/libs/srtp/CMakeLists.txt b/src/libs/srtp/CMakeLists.txt index 4b12a7d9..8a50e108 100644 --- a/src/libs/srtp/CMakeLists.txt +++ b/src/libs/srtp/CMakeLists.txt @@ -39,3 +39,11 @@ target_include_directories(srtp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/crypto/include ) + +if (CMAKE_SYSTEM MATCHES "Linux*" OR CMAKE_SYSTEM MATCHES "Darwin*") + set (PLATFORM_DEFINES HAVE_NETINET_IN_H) +else() + set (PLATFORM_DEFINES HAVE_WINSOCK2_H) +endif() + +target_compile_definitions(srtp PUBLIC -DHAVE_INTTYPES_H -D${PLATFORM_DEFINES}) diff --git a/src/libs/srtp/crypto/include/integers.h b/src/libs/srtp/crypto/include/integers.h index e64be174..11ddca94 100644 --- a/src/libs/srtp/crypto/include/integers.h +++ b/src/libs/srtp/crypto/include/integers.h @@ -84,7 +84,7 @@ # if SIZEOF_UNSIGNED_LONG == 8 typedef unsigned long uint64_t; # elif SIZEOF_UNSIGNED_LONG_LONG == 8 -typedef unsigned long long uint64_t; +//typedef unsigned long long uint64_t; # else # ifdef _WIN32 typedef unsigned __int64 uint64_t;