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

ILBC build is now optionnal

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-01-07 10:30:50 +01:00
parent 2760ca1d45
commit 82baf820c6
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -56,6 +56,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_LIBILBC=1
LIBLINPHONE_EXTENDED_SRC_FILES= LIBLINPHONE_EXTENDED_SRC_FILES=
LIBLINPHONE_EXTENDED_C_INCLUDES= LIBLINPHONE_EXTENDED_C_INCLUDES=
LIBLINPHONE_EXTENDED_CFLAGS= LIBLINPHONE_EXTENDED_CFLAGS=
@ -110,7 +111,11 @@ $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile
cd $(LIBILBC_BUILD_DIR)/downloads && make \ cd $(LIBILBC_BUILD_DIR)/downloads && make \
|| ( echo "iLBC prepare stage failed" ; exit 1 ) || ( echo "iLBC prepare stage failed" ; exit 1 )
ifeq ($(BUILD_LIBILBC),1)
prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
else
prepare-ilbc:
endif
#ffmpeg #ffmpeg
ifeq ($(BUILD_VIDEO),1) ifeq ($(BUILD_VIDEO),1)
@ -397,6 +402,7 @@ $(SQLITE_BUILD_DIR)/sqlite3.c: $(SQLITE_BASENAME).zip
$(SQLITE_BASENAME).zip: $(SQLITE_BASENAME).zip:
curl -sO $(SQLITE_URL) curl -sO $(SQLITE_URL)
#Matroska2 #Matroska2
MATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska MATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska
MATROSKA_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libmatroska MATROSKA_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libmatroska

2
jni/Android.mk
View file

@ -82,7 +82,9 @@ endif
include $(linphone-root-dir)/submodules/mssilk/Android.mk include $(linphone-root-dir)/submodules/mssilk/Android.mk
endif endif
ifeq ($(BUILD_ILBC), 1)
include $(linphone-root-dir)/submodules/msilbc/Android.mk include $(linphone-root-dir)/submodules/msilbc/Android.mk
endif
ifeq ($(_BUILD_VIDEO),1) ifeq ($(_BUILD_VIDEO),1)

2
jni/Application.mk
View file

@ -127,7 +127,9 @@ ifeq ($(BUILD_ZRTP), 1)
APP_MODULES += libbzrtp APP_MODULES += libbzrtp
endif endif
ifeq ($(BUILD_ILBC), 1)
APP_MODULES +=libmsilbc APP_MODULES +=libmsilbc
endif
ifeq ($(BUILD_SRTP), 1) ifeq ($(BUILD_SRTP), 1)
APP_MODULES += libsrtp APP_MODULES += libsrtp

2
submodules/linphone

@ -1 +1 @@
Subproject commit ce396cc98279b99ac6b67f8e15c09ae059241843 Subproject commit ff330203afef25cb00b50210f4111af883e6b0f1