summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-21 09:45:17 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-21 09:45:17 +0000
commit1127c1e91d6bed25d0ae7ec8ad7d3afc13dc84b9 (patch)
treea94824ec980c30b647740b53ce03415e4d569263 /libmpcodecs/Makefile
parent5b9aeb48e66028de4d1b393d788920f81d6274e7 (diff)
downloadmpv-1127c1e91d6bed25d0ae7ec8ad7d3afc13dc84b9.tar.bz2
mpv-1127c1e91d6bed25d0ae7ec8ad7d3afc13dc84b9.tar.xz
Remove separation between Win32 DLL and DirectShow support in the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18768 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/Makefile')
-rw-r--r--libmpcodecs/Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 331f6d7abe..c6b5ce7218 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -23,8 +23,6 @@ AUDIO_SRCS_NAT=ad_alaw.c \
ad_pcm.c \
AUDIO_SRCS_OPT=ad_acm.c \
- ad_dmo.c \
- ad_dshow.c \
ad_faad.c \
ad_libdv.c \
ad_libmad.c \
@@ -39,6 +37,9 @@ endif
ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
AUDIO_SRCS_OPT+=ad_ffmpeg.c
endif
+ifeq ($(WIN32DLL),yes)
+AUDIO_SRCS_OPT+=ad_dshow.c ad_dmo.c
+endif
AUDIO_SRCS=dec_audio.c \
ad.c \
@@ -58,8 +59,6 @@ VIDEO_SRCS_NAT=vd_hmblck.c \
vd_sgi.c \
VIDEO_SRCS_OPT=vd_divx4.c \
- vd_dmo.c \
- vd_dshow.c \
vd_libdv.c \
vd_odivx.c \
vd_qtvideo.c \
@@ -78,6 +77,9 @@ endif
ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
VIDEO_SRCS_OPT+=vd_ffmpeg.c
endif
+ifeq ($(WIN32DLL),yes)
+VIDEO_SRCS_OPT+=vd_dmo.c vd_dshow.c
+endif
VIDEO_SRCS=dec_video.c \
vd.c \