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

Added option in Makefile to disable ms2 opensles soundcard compilation to produce Android 2.2 compliant library

Browse source
This commit is contained in:
Sylvain Berfini 2014-02-03 17:00:13 +01:00
parent 8ea7c48f4c
commit e963be6567
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -63,6 +63,7 @@ BUILD_SQLITE=1
BUILD_CONTACT_HEADER=0 BUILD_CONTACT_HEADER=0
BUILD_RTP_MAP=0 BUILD_RTP_MAP=0
BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0 BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0
BUILD_OPENSLES_SOUNDCARD=1
# Checks # Checks
CHECK_MSG=$(shell ./check_tools.sh) CHECK_MSG=$(shell ./check_tools.sh)
@ -334,7 +335,8 @@ prepare-sources: build-ffmpeg build-x264 prepare-ilbc build-vpx prepare-silk pre
GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \ GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \ BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \
BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) \ BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) \
BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) \
BUILD_OPENSLES_SOUNDCARD=$(BUILD_OPENSLES_SOUNDCARD)
LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \ LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \

2
submodules/linphone

@ -1 +1 @@
Subproject commit 7240e93a3c31d45ef376d887da3662d02b0c62bc Subproject commit 941883df0752dcec9ba8d5fdb5bc33027be58192