Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix compilation with openssl.

Browse source
This commit is contained in:
Guillaume Beraudo 2013-09-04 11:29:20 +02:00
parent 3544debb13
commit bdc503644e
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/Android.mk
View file

@ -69,7 +69,7 @@ include $(linphone-root-dir)/submodules/linphone/mediastreamer2/tools/Android.mk
# Openssl # Openssl
ifneq ($(BUILD_TUNNEL)$(BUILD_GPLV3_ZRTP), 00) ifeq ($(BUILD_GPLV3_ZRTP), 1)
ifeq (,$(DUMP_VAR)) ifeq (,$(DUMP_VAR))
$(info Openssl is required) $(info Openssl is required)
endif endif

2
jni/Application.mk
View file

@ -76,7 +76,7 @@ APP_MODULES += libtunnelclient
endif endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(BUILD_TUNNEL), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
APP_MODULES += liblincrypto liblinssl APP_MODULES += liblincrypto liblinssl
endif endif

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit e43c0000fc5b891eaf5685026cafdab18bffe89b Subproject commit 7faa117c9264a659b3899d080d72bbcca8b73376

2
submodules/linphone

@ -1 +1 @@
Subproject commit 9a671657c6edb30c188450ff257cb3dd88d839ee Subproject commit 50469413f014b67c8bc0c667070d7d0a5b8fd98d