X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=28dbfe97876ce033249e29ac8a17eaa0f01bd7bf;hb=641707d30e39c4cfa108587019817c96695cef21;hp=c605cdf6606428836db62c6e51a72f44b1d39f98;hpb=e1b9b4dafb0b99724435c86e64be2c7593899b0e;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index c605cdf660..28dbfe9787 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -91,16 +91,21 @@ endif
 #
 # cross compiling
 #
+#This should be inside the if block but some config scripts are buggy
+HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD) --program-prefix=""
 ifneq ($(BUILD),$(HOST))
     #
     # Compiling for MinGW under Cygwin could be deemed as cross compiling
     # unfortunately there isn't a complete separate GCC toolchain for MinGW under Cygwin
     #
-    HOSTCONF=--host=$(HOST) --build=$(BUILD)
     ifeq ($(findstring cygwin,$(BUILD)),)
-	# We are REALLY cross compiling
-	FFMPEGCONF=--cross-prefix=$(HOST)-
-	X264CONF=--crosscompile=$(HOST)
+        # We are REALLY cross compiling
+        FFMPEGCONF=--cross-prefix=$(HOST)-
+        X264CONF=--crosscompile=$(HOST)
+	PTHREADSCONF="CROSS=$(HOST)-"
+    else
+        # We are compiling for MinGW on Cygwin
+	PTHREADSCONF=$(HOSTCC)
     endif
 endif
 
@@ -139,13 +144,23 @@ endif
 # ***************************************************************************
 
 ifdef HAVE_DARWIN_OS
- all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
-	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-	.FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
-	.dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
-	.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
-	.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
-        .libdca .tag .x264 .goom2k4
+  ifdef HAVE_FUTURE_DARWIN_OS
+     all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
+        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+        .FLAC .speex .shout .faad .faac .lame .ebml .matroska .ffmpeg \
+        .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
+        .png .gpg-error .gcrypt .gnutls .opendaap .SDL_image \
+        .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder \
+            .libdca .tag .goom2k4 .aclocal
+  else
+     all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
+        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+        .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
+        .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
+        .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
+        .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder \
+            .libdca .tag .x264 .goom2k4 .aclocal
+  endif
 # .expat .clinkcc don't work with SDK yet
 # .glib .libidl .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
@@ -192,10 +207,10 @@ else
    all: .iconv .intl .freetype .fribidi .zlib \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
-	.live .goom2k4 .caca .mod .x264  .xml .twolame\
-	.png .gpg-error .gcrypt .gnutls .mpcdec\
+	.live .goom2k4 .caca .mod .x264  .xml .twolame \
+	.png .gpg-error .gcrypt .gnutls .mpcdec \
 	.dvdnav .dvbpsi .wxwidgets .dirac \
-	.aclocal .libdca
+	.aclocal .libdca .libraw1394 .libdc1394
 #	.png .gpg-error .gcrypt .gnutls .mpcdec\
 #	.SDL_image  .daap .cddb .cdio .vcdimager 
    endif
@@ -407,7 +422,10 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/gettext-macosx.patch 
+	patch -p0 < Patches/gettext-macosx.patch 
+endif
+ifdef HAVE_WIN32
+	patch -p0 < Patches/gettext-win32.patch
 endif
 
 .intl: gettext .iconv
@@ -449,7 +467,7 @@ libiconv-$(LIBICONV_VERSION).tar.gz:
 libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/libiconv.patch
+	patch -p0 < Patches/libiconv.patch
 endif
 
 ifdef HAVE_DARWIN_OS
@@ -494,9 +512,9 @@ fribidi-$(FRIBIDI_VERSION).tar.gz:
 
 fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/fribidi.patch.real
+	patch -p0 < Patches/fribidi.patch.real
 ifdef HAVE_WIN32
-	patch -p 0 <Patches/fribidi-win32.patch
+	patch -p0 <Patches/fribidi-win32.patch
 endif
 .fribidi: fribidi .iconv
 	(cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install)
@@ -608,10 +626,10 @@ libogg-$(OGG_VERSION).tar.gz:
 
 libogg: libogg-$(OGG_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/ogg.patch
-	patch -p 0 < Patches/libogg-1.1.patch
+	patch -p0 < Patches/ogg.patch
+	patch -p0 < Patches/libogg-1.1.patch
 ifdef HAVE_WINCE
-	patch -p 0 < Patches/libogg-wince.patch
+	patch -p0 < Patches/libogg-wince.patch
 endif
 	(cd $@; autoconf)
 
@@ -633,14 +651,14 @@ DISTCLEAN_PKG += libogg-$(OGG_VERSION).tar.gz
 #	cvs -d $(OGG_CVSROOT) login
 #	cvs -d $(OGG_CVSROOT) co vorbis
 #	(cd $@; ./autogen.sh)
-#	patch -p 0 < Patches/vorbis.patch
+#	patch -p0 < Patches/vorbis.patch
 
 libvorbis-$(VORBIS_VERSION).tar.gz:
 	$(WGET) $(VORBIS_URL)
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/libvorbis-1.1.patch
+	patch -p0 < Patches/libvorbis-1.1.patch
 	(cd $@; autoconf)
 
 .vorbis: libvorbis .ogg
@@ -744,10 +762,10 @@ flac-$(FLAC_VERSION).tar.gz:
 flac: flac-$(FLAC_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/flac-mactel.patch
+	patch -p0 < Patches/flac-mactel.patch
 endif
 ifneq ($(HOST),$(BUILD))
-	(patch -p 0 < Patches/flac-cross.patch && cd $@ && autoconf)
+	(patch -p0 < Patches/flac-cross.patch && cd $@ && autoconf)
 endif
 
 .FLAC: flac 
@@ -798,7 +816,7 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz
 #	@echo "*** Please type return here : ***"
 #	cvs -d $(FAAD2_CVSROOT) login
 #	cvs -d $(FAAD2_CVSROOT) co faad2
-#	(cd $@; patch -p 0 < ../Patches/faad2.patch)
+#	(cd $@; patch -p1 < ../Patches/faad2.patch)
 #	(cd $@; sh ./bootstrap)
 
 faad2-$(FAAD2_VERSION).tar.bz2:
@@ -806,7 +824,7 @@ faad2-$(FAAD2_VERSION).tar.bz2:
 
 faad: faad2-$(FAAD2_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	(cd $@; patch -p 0  < ../Patches/faad2.patch && ./bootstrap)
+	(cd $@; patch -p1 < ../Patches/faad2.patch && ./bootstrap)
 
 .faad: faad
 	(cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
@@ -826,7 +844,7 @@ faac-$(FAAC_VERSION).tar.bz2:
 
 faac: faac-$(FAAC_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/faac.patch
+	patch -p0 < Patches/faac.patch
 
 .faac: faac
 	(cd $<; rm -f install-sh mkinstalldirs missing && ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
@@ -870,7 +888,7 @@ libebml: libebml-$(LIBEBML_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 endif
 ifdef HAVE_WIN32
-	(cd $@; patch -p 0 < ../Patches/libebml-svn-win32.patch)
+	(cd $@; patch -p0 < ../Patches/libebml-svn-win32.patch)
 endif
 
 .ebml: libebml
@@ -901,7 +919,7 @@ libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 endif
 ifdef HAVE_WIN32
-	(cd $@; patch -p 0 < ../Patches/libmatroska-win32.patch)
+	(cd $@; patch -p0 < ../Patches/libmatroska-win32.patch)
 endif
 
 .matroska: libmatroska .ebml
@@ -924,10 +942,16 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 ffmpeg:
 	$(SVN) co $(FFMPEG_SVN)  ffmpeg
 ifeq ($(HOST),i586-pc-beos)
-	(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
+	(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
 ifdef HAVE_WINCE
-	patch -p 1 < Patches/ffmpeg-svn-wince.patch
+	patch -p1 < Patches/ffmpeg-svn-wince.patch
+endif
+ifdef HAVE_WIN32
+	(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
+endif
+ifdef HAVE_BEOS
+	(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
 endif
 
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
@@ -935,7 +959,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
 
 #ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
 #	$(EXTRACT_GZ)
-#	patch -p 0 < Patches/ffmpeg.patch
+#	patch -p0 < Patches/ffmpeg.patch
 
 ifdef HAVE_WINCE
 .ffmpeg: ffmpeg .zlib
@@ -990,7 +1014,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 #		rm -rf $@ \
 #		exit 1; \
 #	fi
-#	(cd libdvdread; patch -p 0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap)
+#	(cd libdvdread; patch -p0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap)
 #endif
 
 #.dvdread: libdvdread .dvdcss
@@ -1021,8 +1045,8 @@ libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
 
 libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/dvdnav.patch
-	patch -p 0 < Patches/libdvdnav-mactel.patch
+	patch -p0 < Patches/dvdnav.patch
+	patch -p0 < Patches/libdvdnav-mactel.patch
 	(cd $@; ./autogen.sh noconfig)
 
 .dvdnav: libdvdnav .dvdcss
@@ -1066,9 +1090,9 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/live.patch
-	patch -p 0 < Patches/livedotcom-win32.patch
-	patch -p 0 < Patches/live-osx.patch
+	patch -p0 < Patches/live.patch
+	patch -p0 < Patches/livedotcom-win32.patch
+	patch -p0 < Patches/live-osx.patch
 
 .live: live
 ifdef HAVE_WIN32 
@@ -1121,13 +1145,13 @@ goom$(GOOM2k4_VERSION).tar.gz:
 goom: goom$(GOOM2k4_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/goom.patch
+	patch -p0 < Patches/goom.patch
 endif
 ifdef HAVE_WIN32
 	(cd $@; dos2unix configure.in)
-	patch -p 0 < Patches/goom2k4-0-win32.patch
+	patch -p0 < Patches/goom2k4-0-win32.patch
 else
-	patch -p 0 < Patches/goom2k4-0-mmx.patch
+	patch -p0 < Patches/goom2k4-0-mmx.patch
 endif
 
 .goom2k4: goom
@@ -1187,7 +1211,7 @@ ifdef SVN
 x264: 
 	$(SVN) co svn://svn.videolan.org/x264/trunk/ x264
 ifdef HAVE_WIN32
-	(cd x264; patch -p 0 < ../Patches/x264-svn-win32.patch )
+	(cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
 else
 x264-$(X264_VERSION).tar.gz:
@@ -1196,19 +1220,20 @@ x264-$(X264_VERSION).tar.gz:
 x264: x264-$(X264_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_WIN32
-	(cd x264;patch -p 0 <../Patches/x264-20050624-win32.patch)
+	(cd x264;patch -p0 <../Patches/x264-20050624-win32.patch)
 else
-	patch -p 0 < Patches/x264.patch
+	patch -p0 < Patches/x264.patch
 	rm x264/x264.c
 endif
 endif
 
-ifeq ($(HOST),i686-apple-darwin8)
-.x264: x264 .nasm
+ifdef HAVE_WIN32
+.x264: x264 .pthreads
+	(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 else
 .x264: x264
-endif
 	(cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+endif
 	touch $@
 
 CLEAN_FILE += .x264
@@ -1324,7 +1349,7 @@ wxwidgets: wxWidgets-$(WXWIDGETS_VERSION).tar.gz
 #	(cd wxwidgets; patch -p1 <../Patches/wxMSW-win32.patch)
 
 .wxwidgets: wxwidgets
-	(cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib  --without-libpng --without-libjpeg --without-libtiff --without-regex  --disable-zipstream --disable-fs_zip --enable-no_rtti  --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl  --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install)
+	(cd wxwidgets; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-optimise --disable-debug --enable-unicode --disable-threads --disable-gif --disable-pcx --disable-iff --disable-pnm --without-zlib  --without-libpng --without-libjpeg --without-libtiff --without-regex  --disable-zipstream --disable-fs_zip --enable-no_rtti  --enable-no_exceptions --disable-exceptions --disable-stl --disable-html --without-expat --disable-protocols --disable-protocol --disable-xrc --disable-sound --disable-dialupman --disable-mediactrl  --disable-joystick --disable-grid --disable-datepick --disable-postscript--disable-filesystem --disable-fileproto --disable-ipc --disable-sockets --disable-precomp-headers && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1360,7 +1385,7 @@ zlib-$(ZLIB_VERSION).tar.gz:
 
 zlib: zlib-$(ZLIB_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/zlib.patch
+	patch -p0 < Patches/zlib.patch
 
 .zlib: zlib
 	(cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install)
@@ -1382,7 +1407,7 @@ pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz:
 portaudio: pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifneq ($(HOST),$(BUILD))
-	(patch -p 0 < Patches/portaudio-cross.patch;cd $@;  autoconf)
+	(patch -p0 < Patches/portaudio-cross.patch;cd $@;  autoconf)
 endif
 
 .portaudio: portaudio 
@@ -1405,7 +1430,7 @@ libxml2-$(XML_VERSION).tar.gz:
 xml: libxml2-$(XML_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_WIN32
-	patch -p 0 < Patches/xml2-win32.patch
+	patch -p0 < Patches/xml2-win32.patch
 	rm -f xml/aclocal.m4
 endif
 
@@ -1431,7 +1456,7 @@ twolame-$(TWOLAME_VERSION).tar.gz:
 twolame: twolame-$(TWOLAME_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_BEOS
-	patch -p 0 < Patches/twolame-BeOS.patch
+	patch -p0 < Patches/twolame-BeOS.patch
 endif
 
 .twolame: twolame
@@ -1457,9 +1482,9 @@ ifdef HAVE_WIN32
 else
 	(cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0)
 endif
-	(patch -p 0 < Patches/libpng-makefile.patch)
+	(patch -p0 < Patches/libpng-makefile.patch)
 ifeq ($(HOST),i686-apple-darwin8)
-	(patch -p 0 < Patches/libpng-darwin-mactel.patch)
+	(patch -p0 < Patches/libpng-darwin-mactel.patch)
 endif
 
 .png: libpng 
@@ -1505,12 +1530,77 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 # gpg-error 
 # ***************************************************************************
 
+# libraw1394
+# ***************************************************************************
+
+#ifdef SVN
+#libraw1394:
+#	$(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
+#        (cd $<; libtoolize --copy --force; \
+#                autopoint -f; \
+#                aclocal -I extras/contrib/share/aclocal; \
+#                autoconf; \
+#                autoheader; \
+#                automake --add-missing --copy -Wall)
+#
+#else
+libraw1394-$(LIBRAW1394_VERSION).tar.gz:
+	$(WGET) $(LIBRAW1394_URL)
+
+libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
+	$(EXTRACT_GZ)
+#endif
+
+.libraw1394: libraw1394
+	(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
+	touch $@
+	
+CLEAN_file += .libraw1394
+CLEAN_PKG += libraw1394
+DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION)
+
+# ***************************************************************************
+# libdc1394
+# ***************************************************************************
+
+#ifdef SVN
+#libdc1394:
+#	$(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
+#        (cd $<; libtoolize --copy --force; \
+#                autopoint -f; \
+#                aclocal -I extras/contrib/share/aclocal; \
+#                autoconf; \
+#                autoheader; \
+#                automake --add-missing --copy -Wall)
+#
+#else
+libdc1394-$(LIBDC1394_VERSION).tar.gz:
+	$(WGET) $(LIBDC1394_URL)
+
+libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
+	$(EXTRACT_GZ)
+#endif
+
+.libdc1394: libdc1394
+	(cd $<; ./configure --prefix=$(PREFIX) && \
+	 patch -p1 < ../Patches/libdc1394-noexamples.patch && \
+	 make && make DESTDIR=$(PRFIX) install)
+	touch $@
+	
+CLEAN_file += .libdc1394
+CLEAN_PKG += libdc1394
+DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION)
+
+# ***************************************************************************
 libgpg-error-$(GPGERROR_VERSION).tar.gz:
 	$(WGET) $(GPGERROR_URL)
 
 libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/libgpg-error.patch
+	patch -p0 < Patches/libgpg-error.patch
+ifdef HAVE_WIN32
+	patch -p0 < Patches/libgpg-error-win32.patch
+endif
 
 .gpg-error: libgpg-error
 ifeq ($(HOST),i686-apple-darwin8)
@@ -1533,14 +1623,14 @@ libgcrypt-$(GCRYPT_VERSION).tar.bz2:
 
 libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/gcrypt.patch
+	patch -p0 < Patches/gcrypt.patch
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) --program-prefix="" CFLAGS="$(CFLAGS)" && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
+	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
 else
 ifeq ($(HOST),i686-apple-darwin8)
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install)
+	(cd $<; $(HOSTCC) ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install)
 endif
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 endif
@@ -1560,11 +1650,13 @@ gnutls-$(GNUTLS_VERSION).tar.bz2:
 
 gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
+ifdef HAVE_WIN32
 	patch -p0 < Patches/gnutls-win32.patch
+endif
 
 .gnutls: gnutls .gcrypt .gpg-error
 ifdef HAVE_WIN32
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --program-prefix="" && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 endif
@@ -1584,7 +1676,7 @@ libopendaap-$(DAAP_VERSION).tar.bz2:
 
 libopendaap: libopendaap-$(DAAP_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/daap.patch
+	patch -p0 < Patches/daap.patch
 
 .opendaap: libopendaap
 	(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make install)
@@ -1604,7 +1696,7 @@ glib-$(GLIB_VERSION).tar.gz:
 
 glib: glib-$(GLIB_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/glib.patch
+	patch -p0 < Patches/glib.patch
 
 .glib: glib
 	(cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install)
@@ -1729,6 +1821,7 @@ ifdef HAVE_WIN32
 else
 	(cd $<; ./configure --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) && make -C port &&make -C libtiff && make -C libtiff install)
 endif
+	$(INSTALL_NAME)
 	touch $@
 
 CLEAN_FILE += .tiff
@@ -1763,7 +1856,7 @@ SDL_image-$(SDL_IMAGE_VERSION).tar.gz:
 
 SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz 
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/SDL_image.patch
+	patch -p0 < Patches/SDL_image.patch
 
 .SDL_image: SDL_image .SDL .png .jpeg .tiff
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-tif --disable-sdltest && make && make install)
@@ -1783,7 +1876,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2:
 
 mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/mpcdec.patch
+	patch -p0 < Patches/mpcdec.patch
 ifdef HAVE_WIN32
 	(cd $@; ./autogen.sh)
 endif
@@ -1813,10 +1906,10 @@ dirac-$(DIRAC_VERSION).tar.gz:
 dirac: dirac-$(DIRAC_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_DARWIN_OS
-	patch -p 0 <Patches/dirac-osx.patch
+	patch -p0 <Patches/dirac-osx.patch
 endif
 ifneq ($(HOST),$(BUILD))
-	patch -p 0 <Patches/dirac-cross.patch
+	patch -p0 <Patches/dirac-cross.patch
 	(cd $@; aclocal && autoconf && automake)
 endif
 
@@ -1891,9 +1984,9 @@ clinkcc: clinkcc$(CLINKCC_VERSION).tar.gz
 	tar xzf $<
 	mv $(patsubst %.tar.gz,Cyberlink,$(patsubst %.tgz,Cyberlink,$(notdir $<))) $@ || true
 	touch $@
-	patch -p 0 < Patches/clinkcc.patch
+	patch -p0 < Patches/clinkcc.patch
 ifdef HAVE_DARWIN_OS
-	patch -p 0 < Patches/clinkcc_osx.patch
+	patch -p0 < Patches/clinkcc_osx.patch
 endif
 
 .clinkcc: clinkcc
@@ -1973,6 +2066,19 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz
 	$(INSTALL_NAME)
 	touch $@
 
+
+pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
+	$(WGET) $(PTHREADS_URL)
+
+pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
+	$(EXTRACT_GZ)
+
+.pthreads: pthreads
+	(cd $<; $(HOSTCC) make $(PTHREADSCONF) GC-inlined; cp pthread.h ../../include/; cp *.dll *.a ../../lib/)
+	$(INSTALL_NAME)
+	touch $@
+
+
 # ***************************************************************************
 # Some cleansing
 # ***************************************************************************