vlc | branch: master | Rafaël Carré <[email protected]> | Sun Jun  8 12:57:53 
2014 -0700| [4840986a24e054640feb0b890336a6351c07e20d] | committer: Rafaël Carré

contrib: caca: drop useless conditions

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

 contrib/src/caca/rules.mak |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak
index e6a9df2..568e906 100644
--- a/contrib/src/caca/rules.mak
+++ b/contrib/src/caca/rules.mak
@@ -14,15 +14,10 @@ $(TARBALLS)/libcaca-$(CACA_VERSION).tar.gz:
 
 caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca
        $(UNPACK)
-ifdef HAVE_MACOSX
-       $(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch
        $(APPLY) $(SRC)/caca/caca-fix-compilation-llvmgcc.patch
-endif
        $(APPLY) $(SRC)/caca/caca-llvm-weak-alias.patch
-
-ifdef HAVE_WIN32
+       $(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch
        $(APPLY) $(SRC)/caca/caca-win32-static.patch
-endif
        $(MOVE)
 
 CACA_CONF := \

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to