Commit 792e1201 authored by Ghislain MARY's avatar Ghislain MARY

Fix Android makefile, Visual Studio project and CMakeLists.txt since ZRTP is...

Fix Android makefile, Visual Studio project and CMakeLists.txt since ZRTP is now managed in mediastreamer2.
parent a6cff1ec
......@@ -59,6 +59,7 @@ option(ENABLE_STATIC "Build static library (default is shared library)." NO)
option(ENABLE_DEBUG_LOGS "Enable the display of traces showing the execution of the library." NO)
option(ENABLE_FIXED_POINT "Turn on fixed point computations." ${ENABLE_FIXED_POINT_DEFAULT_VALUE})
option(ENABLE_RELATIVE_PREFIX "Find resources relatively to the installation directory." NO)
option(ENABLE_ZRTP "Build with ZRTP support." YES)
option(ENABLE_SOUND "Can be used to turn off all possible sound backends." YES)
cmake_dependent_option(ENABLE_ALSA "Enable ALSA support." YES "ENABLE_SOUND;LINUX_OR_BSD" NO)
......@@ -131,6 +132,13 @@ include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)
find_package(ORTP REQUIRED)
if(ENABLE_ZRTP)
find_package(BZRTP)
if(NOT BZRTP_FOUND)
message(WARNING "Could not find bzrtp library, mediastreamer2 will be compiled without ZRTP support.")
set(ENABLE_ZRTP OFF CACHE BOOL "Build mediastreamer2 with ZRTP support." FORCE)
endif()
endif()
if(ENABLE_GSM)
find_package(GSM)
if(NOT GSM_FOUND)
......@@ -234,6 +242,9 @@ include_directories(
if(ENABLE_VIDEO)
include_directories(src/voip)
endif()
if(BZRTP_FOUND)
include_directories(${BZRTP_INCLUDE_DIRS})
endif()
if(GSM_FOUND)
include_directories(${GSM_INCLUDE_DIRS})
endif()
......
......@@ -67,6 +67,7 @@ LOCAL_SRC_FILES = \
voip/bitratedriver.c \
voip/qosanalyzer.c \
voip/msmediaplayer.c \
voip/zrtp.c \
utils/dsptools.c \
utils/kiss_fft.c \
utils/kiss_fftr.c \
......@@ -247,6 +248,12 @@ LOCAL_STATIC_LIBRARIES += \
libspeex \
libspeexdsp
ifeq ($(BUILD_ZRTP), 1)
LOCAL_STATIC_LIBRARIES += libbzrtp
LOCAL_CFLAGS += -DHAVE_zrtp
LOCAL_C_INCLUDES += $(ZRTP_C_INCLUDE)
endif #ZRTP
ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC), 00)
LOCAL_CFLAGS += -DHAVE_WEBRTC
LOCAL_STATIC_LIBRARIES += libmswebrtc
......
......@@ -132,6 +132,7 @@
<ClInclude Include="..\..\..\include\mediastreamer2\msvolume.h" />
<ClInclude Include="..\..\..\include\mediastreamer2\mswebcam.h" />
<ClInclude Include="..\..\..\include\mediastreamer2\videostarter.h" />
<ClInclude Include="..\..\..\include\mediastreamer2\zrtp.h" />
<ClInclude Include="..\..\..\src\audiofilters\g711.h" />
<ClInclude Include="..\..\..\src\utils\g722.h" />
<ClInclude Include="..\..\..\src\utils\kiss_fft.h" />
......@@ -206,6 +207,7 @@
<ClCompile Include="..\..\..\src\voip\ringstream.c" />
<ClCompile Include="..\..\..\src\voip\videostarter.c" />
<ClCompile Include="..\..\..\src\voip\videostream.c" />
<ClCompile Include="..\..\..\src\voip\zrtp.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\gsm\build\wp8\gsm\gsm.vcxproj">
......
......@@ -182,6 +182,9 @@ if(WIN32)
list(APPEND VOIP_SOURCE_FILES audiofilters/winsnd3.c)
endif()
if(BZRTP_FOUND)
list(APPEND VOIP_SOURCE_FILES voip/zrtp.c)
endif()
if(GSM_FOUND)
list(APPEND VOIP_SOURCE_FILES audiofilters/gsm.c)
endif()
......@@ -332,6 +335,9 @@ endif()
if(HAVE_DLOPEN)
list(APPEND VOIP_LIBS dl)
endif()
if(BZRTP_FOUND)
list(APPEND VOIP_LIBS ${BZRTP_LIBRARIES})
endif()
if(GSM_FOUND)
list(APPEND VOIP_LIBS ${GSM_LIBRARIES})
endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment