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

7 files changed, 6 insertions, 20 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 \
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c
index 5cca0f9cc6..4fb4d3e231 100644
--- a/libmpcodecs/ad.c
+++ b/libmpcodecs/ad.c
@@ -64,10 +64,8 @@ ad_functions_t* mpcodecs_ad_drivers[] =
   &mpcodecs_ad_dk3adpcm,
   &mpcodecs_ad_msgsm,
 #ifdef USE_WIN32DLL
-#ifdef USE_DIRECTSHOW
   &mpcodecs_ad_dshow,
   &mpcodecs_ad_dmo,
-#endif
   &mpcodecs_ad_acm,
   &mpcodecs_ad_twin,
 #endif
diff --git a/libmpcodecs/ad_dmo.c b/libmpcodecs/ad_dmo.c
index a9053caa13..b8d7d9db28 100644
--- a/libmpcodecs/ad_dmo.c
+++ b/libmpcodecs/ad_dmo.c
@@ -6,8 +6,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#ifdef USE_DIRECTSHOW
-
 #include "ad_internal.h"
 
 static ad_info_t info = 
@@ -101,4 +99,3 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
 //        len=size_out;
   return size_out;
 }
-#endif
diff --git a/libmpcodecs/ad_dshow.c b/libmpcodecs/ad_dshow.c
index 5e98928b57..d6bc08a795 100644
--- a/libmpcodecs/ad_dshow.c
+++ b/libmpcodecs/ad_dshow.c
@@ -6,8 +6,6 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#ifdef USE_DIRECTSHOW
-
 #include "ad_internal.h"
 
 static ad_info_t info = 
@@ -97,4 +95,3 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
 //        len=size_out;
   return size_out;
 }
-#endif
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 426fd05b09..8c11c4e015 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -62,10 +62,8 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
 	&mpcodecs_vd_theora,
 #endif
 #ifdef USE_WIN32DLL
-#ifdef USE_DIRECTSHOW
         &mpcodecs_vd_dshow,
         &mpcodecs_vd_dmo,
-#endif
         &mpcodecs_vd_vfw,
         &mpcodecs_vd_vfwex,
 #endif
diff --git a/libmpcodecs/vd_dmo.c b/libmpcodecs/vd_dmo.c
index 737c0e2374..22682675ca 100644
--- a/libmpcodecs/vd_dmo.c
+++ b/libmpcodecs/vd_dmo.c
@@ -3,7 +3,6 @@
 #include <stdarg.h>
 
 #include "config.h"
-#ifdef USE_DIRECTSHOW
 
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -85,5 +84,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
 
     return mpi;
 }
-
-#endif
diff --git a/libmpcodecs/vd_dshow.c b/libmpcodecs/vd_dshow.c
index 6f0923636f..391c59fe94 100644
--- a/libmpcodecs/vd_dshow.c
+++ b/libmpcodecs/vd_dshow.c
@@ -3,7 +3,6 @@
 #include <stdarg.h>
 
 #include "config.h"
-#ifdef USE_DIRECTSHOW
 
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -114,5 +113,3 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
 
     return mpi;
 }
-
-#endif