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

Add flags for compilation with contact header and rtpmap

Browse source 
Update linphone and bellesip
This commit is contained in:
Margaux Clerc 2013-11-27 17:05:20 +01:00
parent a6bfed0529
commit 84623b9474
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -48,6 +48,8 @@ BUILD_FOR_X86=1
USE_JAVAH=1 USE_JAVAH=1
BUILD_TLS=1 BUILD_TLS=1
BUILD_SQLITE=1 BUILD_SQLITE=1
BUILD_CONTACT_HEADER=0
BUILD_RTP_MAP=0
# Checks # Checks
CHECK_MSG=$(shell ./check_tools.sh) CHECK_MSG=$(shell ./check_tools.sh)
@ -301,7 +303,8 @@ GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \ LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \
LINPHONE_VERSION=$(LINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \ LINPHONE_VERSION=$(LINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \
BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE) \
BUILD_CONTACT_HEADER=$(BUILD_CONTACT_HEADER) BUILD_RTP_MAP=$(BUILD_RTP_MAP)
MEDIASTREAMER2_OPTIONS = $(GENERATE_OPTIONS) BUILD_MEDIASTREAMER2_SDK=1 MEDIASTREAMER2_OPTIONS = $(GENERATE_OPTIONS) BUILD_MEDIASTREAMER2_SDK=1

2
src/org/linphone/LinphonePreferences.java
View file

@ -278,7 +278,7 @@ public class LinphonePreferences {
if (proxy == null || proxy.length() <= 0) { if (proxy == null || proxy.length() <= 0) {
proxy = getAccountDomain(n); proxy = getAccountDomain(n);
} }
if (!proxy.startsWith("sip:")) { if (!proxy.contains("sip:")) {
proxy = "sip:" + proxy; proxy = "sip:" + proxy;
} }

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 38225cd88dfd1feeccd15fa88d42fb2261964a61 Subproject commit 7fa044d8db5ea0e00cc5e7ea02858ed014b9ccb9

2
submodules/linphone

@ -1 +1 @@
Subproject commit 4ddeb921c1360f6c78753a49a0931eafcc9de4f0 Subproject commit 41f0390f931534f9ae4872816e1449c354b79bf5