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

Merge branch 'newUI' of git.linphone.org:linphone-android into newUI

Browse source
This commit is contained in:
Sylvain Berfini 2012-07-30 17:10:20 +02:00
commit 011517b6fb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,6 +1,6 @@
NDK_PATH=$(shell dirname `which ndk-build`) NDK_PATH=$(shell dirname `which ndk-build`)
SDK_PATH=$(shell dirname `which android`) SDK_PATH=$(shell dirname `which android`)
NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo) NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
TOPDIR=$(shell pwd) TOPDIR=$(shell pwd)
PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon) PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
KEYSTORE=bc-android.keystore KEYSTORE=bc-android.keystore