From 5fc519f8a2f2b1fb0965acbaee47ee7c06468e9a Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 31 Mar 2014 12:00:43 +0200 Subject: [PATCH] Add the ability to force the use of compiled versions of libvpx --- submodules/build/builders.d/libvpx.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 83891028b..a663f0b41 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -24,6 +24,10 @@ all_p=armv6-darwin-gcc #neon Cortex-A8 all_p+=armv7-darwin-gcc #neon Cortex-A8 all_p+=armv7s-darwin-gcc #neon Cortex-A8 +ifeq ($(force_non_binary_libvpx),1) +take_binary= +endif + $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp: @@ -42,6 +46,9 @@ build-libvpx: $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) \ && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install +ifeq ($(force_non_binary_libvpx),1) + @echo "\033[01;32m DON'T get BINARY version of libvpx for $(take_binary), because 'force_non_binary_libvpx' is 1 \033[0m" +endif ifneq (,$(take_binary)) # we have to take binary version of libvpx for ARM because Clang introduces bugs in optimized assembly @echo "\033[01;32m Getting BINARY version of libvpx for $(take_binary) \033[0m"