Skip to content

V
vlc
Commit bdb36c1b authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

contrib: don't depend on headers available in mingw-w64

parent 521f4090
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
contrib/src/directx/rules.mak
View file @ bdb36c1b
...@@ -4,8 +4,10 @@ DX_HEADERS_URL := $(CONTRIB_VIDEOLAN)/directx-oss.tar.bz2 ...@@ -4,8 +4,10 @@ DX_HEADERS_URL := $(CONTRIB_VIDEOLAN)/directx-oss.tar.bz2
DXVA2_URL := $(CONTRIB_VIDEOLAN)/dxva2api.h DXVA2_URL := $(CONTRIB_VIDEOLAN)/dxva2api.h
ifdef HAVE_WIN32 ifdef HAVE_WIN32
ifndef HAVE_MINGW_W64
PKGS += directx PKGS += directx
endif endif
endif
$(TARBALLS)/directx-oss.tar.bz2: $(TARBALLS)/directx-oss.tar.bz2:
$(call download,$(DX_HEADERS_URL)) $(call download,$(DX_HEADERS_URL))
......
contrib/src/dshow/rules.mak
View file @ bdb36c1b
...@@ -6,8 +6,10 @@ D2D_URL := http://nodeload.github.com/2of1/d2d1headers/tarball/master ...@@ -6,8 +6,10 @@ D2D_URL := http://nodeload.github.com/2of1/d2d1headers/tarball/master
# FIXME: ^ D2D not working # FIXME: ^ D2D not working
ifdef HAVE_WIN32 ifdef HAVE_WIN32
ifndef HAVE_MINGW_W64
PKGS += dshow PKGS += dshow
endif endif
endif
$(TARBALLS)/dshow-headers-oss.tar.bz2: $(TARBALLS)/dshow-headers-oss.tar.bz2:
$(call download,$(DSHOW_HEADERS_URL)) $(call download,$(DSHOW_HEADERS_URL))
......
contrib/src/ffmpeg/rules.mak
View file @ bdb36c1b
...@@ -69,7 +69,9 @@ endif ...@@ -69,7 +69,9 @@ endif
# Windows # Windows
ifdef HAVE_WIN32 ifdef HAVE_WIN32
ifndef HAVE_MINGW_W64
DEPS_ffmpeg += directx DEPS_ffmpeg += directx
endif
FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack
FFMPEGCONF += --enable-w32threads \ FFMPEGCONF += --enable-w32threads \
--disable-bzlib --disable-bsfs \ --disable-bzlib --disable-bsfs \
......
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