- fixes for Linux CI build

This commit is contained in:
Dmytro Bogovych 2019-06-12 12:38:39 +03:00
parent e7d015c110
commit 19e1a65abb
4 changed files with 11 additions and 2 deletions

View File

@ -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)

View File

@ -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

View File

@ -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})

View File

@ -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;