From e55145d40b28a21c5ba9389a3382a468d753e989 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 9 Jan 2015 13:49:56 +0100 Subject: [PATCH] re-enable iLBC --- Makefile | 6 +++--- README | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 428727a39..22a170420 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ BUILD_SQLITE=1 BUILD_CONTACT_HEADER=0 BUILD_RTP_MAP=0 BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0 -BUILD_LIBILBC=1 +BUILD_ILBC=1 LIBLINPHONE_EXTENDED_SRC_FILES= LIBLINPHONE_EXTENDED_C_INCLUDES= LIBLINPHONE_EXTENDED_CFLAGS= @@ -111,7 +111,7 @@ $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile cd $(LIBILBC_BUILD_DIR)/downloads && make \ || ( echo "iLBC prepare stage failed" ; exit 1 ) -ifeq ($(BUILD_LIBILBC),1) +ifeq ($(BUILD_ILBC),1) prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c else prepare-ilbc: @@ -422,7 +422,7 @@ prepare-sources: build-ffmpeg build-x264 build-openh264 prepare-ilbc build-vpx p 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_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) BUILD_OPENH264=$(BUILD_OPENH264) ENABLE_OPENH264_DECODER=$(ENABLE_OPENH264_DECODER) BUILD_MATROSKA=$(BUILD_MATROSKA) \ - BUILD_UPNP=$(BUILD_UPNP) BUILD_ZRTP=$(BUILD_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) + BUILD_UPNP=$(BUILD_UPNP) BUILD_ZRTP=$(BUILD_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) BUILD_ILBC=$(BUILD_ILBC) LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \ diff --git a/README b/README index 6dfb26d6c..d2de7d3a7 100644 --- a/README +++ b/README @@ -139,3 +139,6 @@ BUILD_UPNP BUILD_MATROSKA values: 0 (don't build matroska and ebml), 1 (do build matroska and ebml), default value: 0 + +BUILD_ILBC + values: 0 (don't build iLBC), 1 (do build iLBC), default value: 1