[vlc-devel] [PATCH] contrib: use the nightly builds as prebuilt on Windows

Steve Lhomme robux4 at videolabs.io
Wed Oct 26 17:42:01 CEST 2016


---
 contrib/src/main.mak | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index da3eebf..d5c3668 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -42,6 +42,10 @@ ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
 
 ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
 HAVE_WIN64 := 1
+CONTRIB_DIR := win64
+endif
+ifeq ($(ARCH)-$(HAVE_WIN32),i386-1)
+CONTRIB_DIR := win32
 endif
 
 ifdef HAVE_CROSS_COMPILE
@@ -406,7 +410,11 @@ distclean: clean
 	$(RM) config.mak
 	unlink Makefile
 
+ifdef CONTRIB_DIR
+PREBUILT_URL=https://nightlies.videolan.org/build/$(CONTRIB_DIR)/last/vlc-contrib-$(HOST)-$(DATE).tar.bz2
+else
 PREBUILT_URL=ftp://ftp.videolan.org/pub/videolan/contrib/$(HOST)/vlc-contrib-$(HOST)-latest.tar.bz2
+endif
 
 vlc-contrib-$(HOST)-latest.tar.bz2:
 	$(call download,$(PREBUILT_URL))
-- 
2.8.2



More information about the vlc-devel mailing list