diff --git a/contrib/src/x264/remove-align.patch b/contrib/src/x264/remove-align.patch deleted file mode 100644 index 64bb928a433189130cc010570a1506ee6a21e56c..0000000000000000000000000000000000000000 --- a/contrib/src/x264/remove-align.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- x264/configure 2013-03-01 16:21:59.000000000 -0500 -+++ x264patched/configure 2015-01-14 14:11:27.000000000 -0500 -@@ -456,7 +456,7 @@ - ;; - darwin*) - SYS="MACOSX" -- CFLAGS="$CFLAGS -falign-loops=16" -+ CFLAGS="$CFLAGS" - libm="-lm" - if [ "$pic" = "no" ]; then - cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic" diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak index de109869c51ed89c7fd284970fecebb5e9ec9706..06eda7b03beaed7ac7c2e684e09208ba544594f6 100644 --- a/contrib/src/x264/rules.mak +++ b/contrib/src/x264/rules.mak @@ -52,8 +52,12 @@ x264: x264-$(X264_HASH).tar.xz .sum-x264 .x264: x264 ifdef HAVE_ANDROID cd $< && $(HOSTVARS) AS="$(CC)" ./configure $(X264CONF) +else +ifdef HAVE_IOS + cd $< && $(HOSTVARS) ASFLAGS="$(CFLAGS)" ./configure $(X264CONF) else cd $< && $(HOSTVARS) ./configure $(X264CONF) +endif endif cd $< && $(MAKE) install touch $@