From 3d7cbbfda6c14da1a4f1a506472c5e6ddff057eb Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 20 Nov 2014 11:27:49 +0100 Subject: [PATCH] Enable debug for libvpx and add a substep to the makefile --- submodules/build/Makefile | 7 +++++-- submodules/build/builders.d/libvpx.mk | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index d8903c92e..6e4c69c8e 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -112,6 +112,9 @@ build-% clean-% veryclean-%: sdk: make -f builder-iphone-os.mk delivery-sdk +libs: + make -f builder-iphone-os.mk multi-arch + download-sdk: make -f builder-iphone-os.mk download-sdk @@ -156,5 +159,5 @@ help: @echo " * [arch]-clean-[package] : clean the package for the selected architecture" @echo " * [arch]-veryclean-[package] : completely clean the package for the selected architecture" @echo "" - @echo " * sdk : re-add all generated libraries to the SDK. Use this only after a full build." - + @echo " * sdk : re-add all generated libraries to the SDK. Use this only after a full build." + @echo " * libs : after a rebuild of a subpackage, will mix the new libs in liblinphone-sdk/apple-darwin directory" diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 16384d4ee..101806bd7 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -6,6 +6,11 @@ libvpx_configure_options=\ --enable-realtime-only --enable-spatial-resampling \ --enable-vp8 --enable-multithread --disable-vp9 + +ifeq ($(enable_debug),yes) + libvpx_configure_options += --enable-debug +endif + take_binary= # force take binary, it seems libvpx was fixed since http://git.chromium.org/gitweb/?p=webm/libvpx.git;a=commit;h=33df6d1fc1d268b4901b74b4141f83594266f041 @@ -21,6 +26,7 @@ else ifneq (,$(findstring armv7,$(host))) take_binary = armv7 else ifneq (,$(findstring aarch64,$(host))) libvpx_configure_options+= --target=arm64-darwin-gcc + take_binary = arm64 else libvpx_configure_options+= --target=x86-darwin10-gcc take_binary = i386