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

fix belle-sip version

Browse source
This commit is contained in:
Simon Morlat 2013-10-16 21:37:35 +02:00
parent 04be0962b5
commit 49a0e765b1
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -21,7 +21,8 @@ NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
TOPDIR=$(shell pwd) TOPDIR=$(shell pwd)
LINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always) LINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always)
LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always) LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always)
BELLESIP_VERSION=$(shell cat submodules/belle-sip/VERSION) BELLESIP_VERSION_SCRIPT:=cat submodules/belle-sip/configure.ac | grep "AC_INIT(" | sed -e "s/.*belle-sip\]//" | sed -e "s/].*//" | sed -e "s/.*\[//"
BELLESIP_VERSION=$(shell $(BELLESIP_VERSION_SCRIPT))
ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1) ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
SQLITE_VERSION=3071700 SQLITE_VERSION=3071700
SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION) SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION)

2
project.properties
View file

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-18 target=android-17
android.library=false android.library=false

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit a0b22b83b56385234d1facfd9fbd4a2a961668f2 Subproject commit 225f9e3d913290b599c3ff96547c01ac6abb4f77

2
submodules/linphone

@ -1 +1 @@
Subproject commit 0e9de476d131cf2e2a39bf6bdf686a451e04d876 Subproject commit 107fb22c07a2372cdaf4d02687d828ec8f044170