[vlc-commits] contrib: speex: enable ARM asm and fixed point if FPU is missing

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jan 22 13:07:04 2012 -0500| [a0d91d13e813a693f4334c9f88925a017ee27ca7] | committer: Jean-Baptiste Kempf

contrib: speex: enable ARM asm and fixed point if FPU is missing
(cherry picked from commit 7a6940fb9c59864c5ef143d95c59ea31aa4e981b)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=a0d91d13e813a693f4334c9f88925a017ee27ca7
---

 contrib/src/speex/rules.mak |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak
index 50290ab..50d5bdf 100644
--- a/contrib/src/speex/rules.mak
+++ b/contrib/src/speex/rules.mak
@@ -20,9 +20,17 @@ speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex
 
 # TODO: fixed point and ASM opts
 
+CONFIG_OPTS := --without-ogg
+ifndef HAVE_FPU
+CONFIG_OPTS += --enable-fixed-point
+endif
+ifeq ($(ARCH),arm)
+CONFIG_OPTS += --enable-arm5e-asm
+endif
+
 .speex: speex
 	$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-ogg
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(CONFIG_OPTS)
 	cd $< && $(MAKE) install
 	touch $@