* added out-of-the-box support for future darwin releases. right now, the following...

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f52bbe5297502f227964d6527cf52b3b4a740cb1..28dbfe97876ce033249e29ac8a17eaa0f01bd7bf 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -103,6 +103,9 @@ ifneq ($(BUILD),$(HOST))
         FFMPEGCONF=--cross-prefix=$(HOST)-
         X264CONF=--crosscompile=$(HOST)
        PTHREADSCONF="CROSS=$(HOST)-"
+    else
+        # We are compiling for MinGW on Cygwin
+       PTHREADSCONF=$(HOSTCC)
     endif
 endif
 
@@ -141,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
@@ -1219,7 +1232,7 @@ ifdef HAVE_WIN32
        (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 else
 .x264: x264
-       (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)"  --enable-pic && make && make install)
+       (cd $<; ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
 endif
        touch $@