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

Improve makefile for libvpx.

Browse source
This commit is contained in:
Ghislain MARY 2013-09-26 11:51:27 +02:00
parent eafb957c38
commit 45de6a529e
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Makefile
View file

@ -107,39 +107,34 @@ clean-ffmpeg:
rm -rf $(FFMPEG_BUILD_DIR)/x86 rm -rf $(FFMPEG_BUILD_DIR)/x86
#libvpx #libvpx
PREPARE_VPX_DEPS := prepare-vpx-arm BUILD_VPX_DEPS=$(LIBVPX_BUILD_DIR)/arm/libvpx.a
CLEAN_VPX_DEPS := clean-vpx-arm
ifeq ($(BUILD_FOR_X86), 1) ifeq ($(BUILD_FOR_X86), 1)
PREPARE_VPX_DEPS += prepare-vpx-x86 BUILD_VPX_DEPS+=$(LIBVPX_BUILD_DIR)/x86/libvpx.a
CLEAN_VPX_DEPS += clean-vpx-x86
endif endif
LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx
LIBVPX_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libvpx
LIBVPX_CONFIGURE_OPTIONS=--disable-vp9 --disable-examples --disable-unit-tests --disable-postproc --enable-error-concealment LIBVPX_CONFIGURE_OPTIONS=--disable-vp9 --disable-examples --disable-unit-tests --disable-postproc --enable-error-concealment
prepare-vpx-arm: $(LIBVPX_BUILD_DIR)/arm/libvpx.a:
mkdir -p submodules/externals/build/libvpx/arm && \ mkdir -p submodules/externals/build/libvpx/arm && \
cd submodules/externals/build/libvpx/arm && \ cd submodules/externals/build/libvpx/arm && \
$(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \ $(LIBVPX_SRC_DIR)/configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) && \
make -j ${NUMCPUS} \ make -j ${NUMCPUS} \
|| ( echo "Prepare stage of libvpx for arm failed." ; exit 1 ) || ( echo "Build of libvpx for arm failed." ; exit 1 )
prepare-vpx-x86: $(LIBVPX_BUILD_DIR)/x86/libvpx.a:
mkdir -p submodules/externals/build/libvpx/x86 && \ mkdir -p submodules/externals/build/libvpx/x86 && \
cd submodules/externals/build/libvpx/x86 && \ cd submodules/externals/build/libvpx/x86 && \
$(LIBVPX_SRC_DIR)/configure --target=x86-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) --extra-cflags="--sysroot=$(NDK_PATH)/platforms/android-18/arch-x86" && \ $(LIBVPX_SRC_DIR)/configure --target=x86-android-gcc --sdk-path=$(NDK_PATH) $(LIBVPX_CONFIGURE_OPTIONS) --extra-cflags="--sysroot=$(NDK_PATH)/platforms/android-18/arch-x86" && \
make -j${NUMCPUS} \ make -j${NUMCPUS} \
|| ( echo "Prepare stage of libvpx for x86 failed." ; exit 1 ) || ( echo "Build of libvpx for x86 failed." ; exit 1 )
prepare-vpx: $(PREPARE_VPX_DEPS) build-vpx: $(BUILD_VPX_DEPS)
clean-vpx-arm: clean-vpx:
rm -rf submodules/externals/build/libvpx/arm rm -rf submodules/externals/build/libvpx/arm && \
clean-vpx-x86:
rm -rf submodules/externals/build/libvpx/x86 rm -rf submodules/externals/build/libvpx/x86
clean-vpx: $(CLEAN_VPX_DEPS)
#SILK #SILK
LIBMSSILK_SRC_DIR=$(TOPDIR)/submodules/mssilk LIBMSSILK_SRC_DIR=$(TOPDIR)/submodules/mssilk
LIBMSSILK_BUILD_DIR=$(LIBMSSILK_SRC_DIR) LIBMSSILK_BUILD_DIR=$(LIBMSSILK_SRC_DIR)
@ -225,7 +220,7 @@ $(SQLITE_BASENAME).zip:
curl -sO $(SQLITE_URL) curl -sO $(SQLITE_URL)
#Build targets #Build targets
prepare-sources: build-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip $(TOPDIR)/res/raw/rootca.pem prepare-sqlite3 prepare-sources: build-ffmpeg prepare-ilbc build-vpx prepare-silk prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip $(TOPDIR)/res/raw/rootca.pem prepare-sqlite3
LIBLINPHONE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) \ LIBLINPHONE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) \
BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) \ BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) \
@ -278,9 +273,9 @@ clean-ndk-build:
$(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS) $(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS)
ant clean ant clean
clean: clean-ndk-build clean-vpx clean: clean-ndk-build
veryclean: clean clean-ffmpeg veryclean: clean clean-ffmpeg clean-vpx
.PHONY: clean .PHONY: clean