[vlc-devel] commit: (contrib) Building zvbi for windows with dynamic pthreadsGC2 dll ( Jean-Paul Saman )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Mon Oct 13 16:14:23 2008 +0200| [ac717cc53cbd4452d08595d76cb3c33d81fec316] | committer: Jean-Paul Saman 

(contrib) Building zvbi for windows with dynamic pthreadsGC2 dll

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

 extras/contrib/src/Makefile                    |    8 ++++++--
 extras/contrib/src/Patches/zvbi-makefile.patch |   17 +++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5d1eed9..0866a04 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1745,7 +1745,7 @@ zvbi-$(ZVBI_VERSION).tar.bz2:
 zvbi: zvbi-$(ZVBI_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 ifdef HAVE_WIN32
-	(cd $@; patch -p1 < ../Patches/zvbi-win32.patch; autoreconf)
+	(cd $@; patch -p1 < ../Patches/zvbi-win32.patch; patch -p1 < ../Patches/zvbi-makefile.patch; autoreconf)
 endif
 
 ifdef HAVE_WIN32
@@ -1756,8 +1756,12 @@ endif
 ifdef HAVE_DARWIN_OS
 	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
 else
+ifdef HAVE_WIN32
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) --std=gnu99" LIBS="-lpthreadGC2" && make && make install)
+else
 	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make -C src && make -C src install)
 endif
+endif
 	$(INSTALL_NAME)
 	touch $@
 
@@ -2344,7 +2348,7 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
 	$(EXTRACT_GZ)
 
 .pthreads: pthreads
-	(cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.a $(PREFIX)/lib/)
+	(cd $<; $(HOSTCC) make $(PTHREADSCONF) GC GC-static && mkdir -p $(PREFIX)/include && cp -v pthread.h sched.h semaphore.h $(PREFIX)/include/ && mkdir -p $(PREFIX)/lib && cp -v *.{a,dll} $(PREFIX)/lib/)
 	$(INSTALL_NAME)
 	touch $@
 
diff --git a/extras/contrib/src/Patches/zvbi-makefile.patch b/extras/contrib/src/Patches/zvbi-makefile.patch
new file mode 100644
index 0000000..268c94a
--- /dev/null
+++ b/extras/contrib/src/Patches/zvbi-makefile.patch
@@ -0,0 +1,17 @@
+--- zvbi/Makefile.am.orig	2008-10-14 08:51:32.000000000 +0200
++++ zvbi/Makefile.am	2008-10-14 08:51:47.000000000 +0200
+@@ -19,13 +19,7 @@ DISTCLEANFILES = site_def.h
+ # Attn order matters.
+ SUBDIRS = \
+ 	m4 \
+-	src \
+-	$(proxy_dirs) \
+-	contrib \
+-	examples \
+-	test \
+-	po \
+-	doc
++	src
+ 
+ ACLOCAL_AMFLAGS = -I m4
+