mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 20:46:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix zrtp compilation bug.

Browse source
This commit is contained in:
Simon Morlat 2013-09-09 12:48:40 +02:00
parent 92abb3d3e5
commit 746b521cde
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build/android/common.mk
View file

@ -188,9 +188,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
LOCAL_SRC_FILES += $(LIBLINPHONE_EXTENDED_SRC_FILES) LOCAL_SRC_FILES += $(LIBLINPHONE_EXTENDED_SRC_FILES)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
ifeq ($(BUILD_GPLV3_ZRTP),1) ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_SHARED_LIBRARIES += libzrtpcpp LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
LOCAL_SHARED_LIBRARIES += libzrtpcpp
endif endif
ifeq ($(BUILD_SRTP),1) ifeq ($(BUILD_SRTP),1)
@ -199,10 +199,11 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
else else
LOCAL_LDLIBS += -lz LOCAL_LDLIBS += -lz
#LOCAL_STATIC_LIBRARIES += libz libdl #LOCAL_STATIC_LIBRARIES += libz libdl
LOCAL_STATIC_LIBRARIES += \
libssl-static libcrypto-static
ifeq ($(BUILD_GPLV3_ZRTP),1) ifeq ($(BUILD_GPLV3_ZRTP),1)
LOCAL_STATIC_LIBRARIES += libzrtpcpp-static LOCAL_STATIC_LIBRARIES += libzrtpcpp-static
LOCAL_STATIC_LIBRARIES += \
libssl-static libcrypto-static
endif endif
ifeq ($(BUILD_SRTP),1) ifeq ($(BUILD_SRTP),1)