Commit 5333d998 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 not managed in mediastreamer2.
parent 15f1e5f8
......@@ -36,7 +36,6 @@ option(ENABLE_NTP_TIMESTAMP "Turn on NTP timestamping on packet reception." NO)
option(ENABLE_PERF "Disable costly features to reduce cpu consumtion and increase performance." NO)
option(ENABLE_SRTP "Build oRTP with the SRTP transport support." YES)
option(ENABLE_TESTS "Enable compilation of test programs." NO)
option(ENABLE_ZRTP "Build oRTP with the ZRTP transport support." YES)
set(CACHE WITH_THREAD_STACK_SIZE "0" CACHE STRING "Set thread stack size (0 is the OS default).")
......@@ -48,13 +47,6 @@ if(ENABLE_SRTP)
set(ENABLE_SRTP OFF CACHE BOOL "Build oRTP with the SRTP transport support." FORCE)
endif()
endif()
if(ENABLE_ZRTP)
find_package(BZRTP)
if(NOT BZRTP_FOUND)
message(WARNING "Could not find bzrtp library, oRTP will be compiled without ZRTP support.")
set(ENABLE_ZRTP OFF CACHE BOOL "Build oRTP with the ZRTP transport support." FORCE)
endif()
endif()
find_package(Doxygen)
......@@ -158,9 +150,6 @@ include_directories(
if(SRTP_FOUND)
include_directories(${SRTP_INCLUDE_DIRS})
endif()
if(BZRTP_FOUND)
include_directories(${BZRTP_INCLUDE_DIRS})
endif()
if(MSVC)
include_directories(${CMAKE_PREFIX_PATH}/include/MSVC)
endif()
......@@ -240,11 +229,6 @@ set(ORTPDEPS_LIBS )
if(SRTP_FOUND)
list(APPEND ORTPDEPS_LIBS "-lsrtp")
endif()
if(BZRTP_FOUND)
# WARNING: this is not sufficient because bzrtd needs dependent libs (polarssl, xml..)
# we should list all these from the findpackage(BZRTP) instead of just having -lbzrtp
list(APPEND ORTPDEPS_LIBS "-lbzrtp")
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ortp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/ortp.pc)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ortp.pc DESTINATION lib/pkgconfig)
......
......@@ -54,8 +54,7 @@ LOCAL_SRC_FILES := \
src/stun_udp.c \
src/ortp_srtp.c \
src/b64.c \
src/netsim.c \
src/zrtp.c
src/netsim.c
LOCAL_CFLAGS += \
-DORTP_INET6 \
......@@ -64,12 +63,6 @@ LOCAL_CFLAGS += \
-Werror -Wall -Wno-error=strict-aliasing -Wuninitialized
ifeq ($(BUILD_ZRTP), 1)
LOCAL_STATIC_LIBRARIES += libbzrtp
LOCAL_CFLAGS += -DHAVE_zrtp
LOCAL_C_INCLUDES += $(ZRTP_C_INCLUDE)
endif #ZRTP
ifeq ($(BUILD_SRTP), 1)
LOCAL_STATIC_LIBRARIES += libsrtp
LOCAL_C_INCLUDES += $(SRTP_C_INCLUDE)
......
......@@ -105,7 +105,6 @@
<ClInclude Include="..\..\..\include\ortp\stun.h" />
<ClInclude Include="..\..\..\include\ortp\stun_udp.h" />
<ClInclude Include="..\..\..\include\ortp\telephonyevents.h" />
<ClInclude Include="..\..\..\include\ortp\zrtp.h" />
<ClInclude Include="..\..\..\src\jitterctl.h" />
<ClInclude Include="..\..\..\src\rtpsession_priv.h" />
<ClInclude Include="..\..\..\src\rtptimer.h" />
......@@ -147,7 +146,6 @@
<CompileAsWinRT>true</CompileAsWinRT>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<ClCompile Include="..\..\..\src\zrtp.c" />
</ItemGroup>
<ItemGroup>
<Reference Include="Windows">
......
......@@ -27,9 +27,6 @@ endif()
if(SRTP_FOUND)
list(APPEND LIBS ${SRTP_LIBRARIES})
endif()
if(BZRTP_FOUND)
list(APPEND LIBS ${BZRTP_LIBRARIES})
endif()
set(SOURCE_FILES
avprofile.c
......@@ -60,7 +57,6 @@ set(SOURCE_FILES
stun_udp.c
telephonyevents.c
utils.c
zrtp.c
)
if(WIN32)
......
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