vlc | branch: master | Steve Lhomme <[email protected]> | Fri May 25 16:57:38 2018 +0200| [405c8b41858af8f7425b61f2e9967a8db297f43f] | committer: Steve Lhomme
contrib: mad: pass the extra flags via a single variable > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=405c8b41858af8f7425b61f2e9967a8db297f43f --- contrib/src/mad/rules.mak | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/src/mad/rules.mak b/contrib/src/mad/rules.mak index c1491cf77a..0c65eb58c5 100644 --- a/contrib/src/mad/rules.mak +++ b/contrib/src/mad/rules.mak @@ -19,6 +19,11 @@ endif $(TARBALLS)/libmad-$(MAD_VERSION).tar.gz: $(call download,$(MAD_URL)) +LIBMAD_VARS := CFLAGS="$(CFLAGS) -O3" +ifdef HAVE_IOS +LIBMAD_VARS += CCAS="$(AS)" +endif + .sum-mad: libmad-$(MAD_VERSION).tar.gz libmad: libmad-$(MAD_VERSION).tar.gz .sum-mad @@ -42,10 +47,6 @@ endif .mad: libmad $(REQUIRE_GPL) $(RECONF) -ifdef HAVE_IOS - cd $< && $(HOSTVARS) CCAS="$(AS)" CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) $(MAD_CONF) -else - cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) $(MAD_CONF) -endif + cd $< && $(HOSTVARS) $(LIBMAD_VARS) ./configure $(HOSTCONF) $(MAD_CONF) cd $< && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
