Commit daf7b179 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files

(contrib) Building zvbi for windows with dynamic pthreadsGC2 dll

parent 612f4f1c
......@@ -6,6 +6,6 @@ all: .iconv .intl .freetype .fribidi .zlib \
.png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
.dx_headers .dshow_headers .gecko-win32 .dca \
.lua .tag .fontconfig .portaudio .kate .libass \
.lua .tag .fontconfig .portaudio .kate .libass .zvbi \
.aclocal
# .daap .cddb .cdio .vcdimager
......@@ -1761,7 +1761,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
......@@ -1771,8 +1771,12 @@ else
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 $@
......@@ -2362,7 +2366,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 $@
......
--- 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
......@@ -17,7 +17,7 @@
--enable-dca \
--enable-libass \
--enable-x264 \
--disable-zvbi --enable-telx \
--enable-zvbi --disable-telx \
--enable-dvdread --with-dvdnav-config-path=/usr/win32/bin \
--enable-shout \
--enable-goom \
......@@ -25,7 +25,7 @@
--enable-portaudio \
--enable-sdl --with-sdl-config-path=/usr/win32/bin \
--enable-qt4 \
--enable-wxwidgets --with-wx-config-path=/usr/win32/lib/wx/config \
--disable-wxwidgets \
--with-freetype-config-path=/usr/win32/bin \
--with-fribidi-config-path=/usr/win32/bin \
--with-xml2-config-path=/usr/win32/bin \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment