From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 18 Aug 2009 22:10:07 +0000 (+0200)
Subject: Deactivate zvbi, pthreads, fluid for Win64 contribs
X-Git-Tag: 1.1.0-ff~4261
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=965d2914c65cf5d89c2c02232a5d0ae5dd36ab2c;p=vlc

Deactivate zvbi, pthreads, fluid for Win64 contribs
---

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 1ad3dcbd1d..cc05363ccc 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -234,7 +234,7 @@ case $HOST in
         echo "HAVE_WIN32 = 1" >> config.mak
         echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
            EXTRA_CFLAGS="-O3"
-        cat src/Distributions/win32.mak >> distro.mak
+        cat src/Distributions/win64.mak >> distro.mak
     ;;
     *mingw32*)
         echo "HAVE_WIN32 = 1" >> config.mak
diff --git a/extras/contrib/src/Distributions/win64.mak b/extras/contrib/src/Distributions/win64.mak
new file mode 100644
index 0000000000..3a03b9f32a
--- /dev/null
+++ b/extras/contrib/src/Distributions/win64.mak
@@ -0,0 +1,13 @@
+# WIN32 rules
+all: .iconv .intl .freetype .fribidi .zlib \
+        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
+        .flac .speex .faad .lame .ebml  .matroska .ffmpeg .dvdcss \
+        .live .goom2k4 .caca .mod .x264  .xml .twolame \
+        .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
+# .pthreads
+#.zvbi \
+#        .fluid .aclocal
+#       .daap .cddb .cdio .vcdimager