vlc | branch: master | Steve Lhomme <[email protected]> | Wed Jun 14 14:02:00 2017 +0200| [875f844c656c70023d4ed76bee21f6f87148bd9c] | committer: Hugo Beauzée-Luyssen
contrib: libarchive: don't force a path with windows.h on other targets than Android Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=875f844c656c70023d4ed76bee21f6f87148bd9c --- contrib/src/libarchive/rules.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak index 0145e49036..e2c309f0cf 100644 --- a/contrib/src/libarchive/rules.mak +++ b/contrib/src/libarchive/rules.mak @@ -17,7 +17,9 @@ $(TARBALLS)/libarchive-$(LIBARCHIVE_VERSION).tar.gz: libarchive: libarchive-$(LIBARCHIVE_VERSION).tar.gz .sum-libarchive $(UNPACK) $(APPLY) $(SRC)/libarchive/0001-Fix-build-failure-without-STATVFS.patch +ifdef HAVE_ANDROID $(APPLY) $(SRC)/libarchive/android.patch +endif ifdef HAVE_WINSTORE $(APPLY) $(SRC)/libarchive/no-windows-files.patch endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
