Commit fd9795ea authored by Felix Paul Kühne's avatar Felix Paul Kühne

contrib/libmad: fixed compilation for iOS

parent c9118e87
diff -ru libmad/imdct_l_arm.S libmad-fixed/imdct_l_arm.S
--- libmad/imdct_l_arm.S 2001-03-25 22:03:34.000000000 +0200
+++ libmad-fixed/imdct_l_arm.S 2012-08-06 18:16:49.000000000 +0200
@@ -202,7 +202,7 @@
.text
- .align
+ .align 2
.global III_imdct_l
.global _III_imdct_l
@@ -468,7 +468,7 @@
@----
- add r2, pc, #(imdct36_long_karray-.-8) @ r2 = base address of Knn array (PIC safe ?)
+ adr r2, imdct36_long_karray
loop:
...@@ -15,11 +15,14 @@ $(TARBALLS)/libmad-$(MAD_VERSION).tar.gz: ...@@ -15,11 +15,14 @@ $(TARBALLS)/libmad-$(MAD_VERSION).tar.gz:
libmad: libmad-$(MAD_VERSION).tar.gz .sum-mad libmad: libmad-$(MAD_VERSION).tar.gz .sum-mad
$(UNPACK) $(UNPACK)
ifdef HAVE_MACOSX ifdef HAVE_DARWIN_OS
cd $@-$(MAD_VERSION) && sed \ cd $@-$(MAD_VERSION) && sed \
-e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' \ -e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' \
-e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' \ -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' \
-i.orig configure -i.orig configure
endif
ifdef HAVE_IOS
$(APPLY) $(SRC)/mad/mad-ios-asm.patch
endif endif
$(APPLY) $(SRC)/mad/mad-noopt.patch $(APPLY) $(SRC)/mad/mad-noopt.patch
$(MOVE) $(MOVE)
...@@ -27,6 +30,10 @@ endif ...@@ -27,6 +30,10 @@ endif
.mad: libmad .mad: libmad
touch libmad/NEWS libmad/AUTHORS libmad/ChangeLog touch libmad/NEWS libmad/AUTHORS libmad/ChangeLog
$(RECONF) $(RECONF)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3 $(NOTHUMB)" ./configure $(HOSTCONF) ifdef HAVE_IOS
cd $< && $(HOSTVARS) CCAS="$(AS)" CFLAGS="$(CFLAGS) -O4 -marm $(NOTHUMB)" ./configure $(HOSTCONF) $(MAD_CONF)
else
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3 $(NOTHUMB)" ./configure $(HOSTCONF) $(MAD_CONF)
endif
cd $< && $(MAKE) install cd $< && $(MAKE) install
touch $@ touch $@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment