[vlc-commits] contrib: don't depend on headers available in mingw-w64

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Thu Feb  2 18:27:04 2012 -0500| [589a19ecdbbdc3f3695db177c584630496ad22a3] | committer: Rafaël Carré

contrib: don't depend on headers available in mingw-w64
(cherry picked from commit bdb36c1b184cd62ccc633b493d5c8fe9e21770ed)

Signed-off-by: Rafaël Carré <funman at videolan.org>

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

 contrib/src/directx/rules.mak |    2 ++
 contrib/src/dshow/rules.mak   |    2 ++
 contrib/src/ffmpeg/rules.mak  |    2 ++
 3 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/contrib/src/directx/rules.mak b/contrib/src/directx/rules.mak
index 1739994..2d5b2ee 100644
--- a/contrib/src/directx/rules.mak
+++ b/contrib/src/directx/rules.mak
@@ -4,8 +4,10 @@ DX_HEADERS_URL := $(CONTRIB_VIDEOLAN)/directx-oss.tar.bz2
 DXVA2_URL := $(CONTRIB_VIDEOLAN)/dxva2api.h
 
 ifdef HAVE_WIN32
+ifndef HAVE_MINGW_W64
 PKGS += directx
 endif
+endif
 
 $(TARBALLS)/directx-oss.tar.bz2:
 	$(call download,$(DX_HEADERS_URL))
diff --git a/contrib/src/dshow/rules.mak b/contrib/src/dshow/rules.mak
index 1ce4324..f27390d 100644
--- a/contrib/src/dshow/rules.mak
+++ b/contrib/src/dshow/rules.mak
@@ -6,8 +6,10 @@ D2D_URL := http://nodeload.github.com/2of1/d2d1headers/tarball/master
 # FIXME: ^ D2D not working
 
 ifdef HAVE_WIN32
+ifndef HAVE_MINGW_W64
 PKGS += dshow
 endif
+endif
 
 $(TARBALLS)/dshow-headers-oss.tar.bz2:
 	$(call download,$(DSHOW_HEADERS_URL))
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index ee44d78..bd07c9c 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -77,7 +77,9 @@ endif
 
 # Windows
 ifdef HAVE_WIN32
+ifndef HAVE_MINGW_W64
 DEPS_ffmpeg += directx
+endif
 FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
 FFMPEGCONF += --enable-w32threads \
 	--disable-bzlib --disable-bsfs \