[Mplayer-cvslog] CVS: main configure,1.325,1.326 Makefile,1.122,1.123

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv20704

Modified Files:
	configure Makefile 
Log Message:
dshow switched to C version

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- configure	10 Dec 2001 14:41:41 -0000	1.325
+++ configure	10 Dec 2001 22:40:14 -0000	1.326
@@ -674,7 +674,7 @@
 _alsa=auto
 _fastmemcpy=yes
 _win32=auto
-_dshow=auto
+_dshow=yes
 _select=yes
 _tv=yes
 _tv_v4l=auto
@@ -2126,12 +2126,15 @@
   echores "$_win32 (found: $_win32libdir)"
 else
   _def_win32='#undef USE_WIN32DLL'
+  _dshow=no
   echores "$_win32"
 fi
 
-
 echocheck "DirectShow"
-if test "$_win32" = yes && test "$_dshow" = auto ; then
+
+if false ; then
+
+if test "$_dshow" != no ; then
   _dshow=no
   # check if compiler supports C++ and C++-libs are installed correctly
   cat > "$TMPCPP" << EOF
@@ -2165,14 +2168,16 @@
 EOF
     die "$_cc's C++ is broken"
   fi
-else
-  _dshow=no
-  echores "$_dshow"
 fi
+
+fi
+
+echores "$_dshow"
+
 if test "$_dshow" = yes ; then
   _def_dshow='#define USE_DIRECTSHOW 1'
-  _ld_dshow='-Lloader/DirectShow -lDS_Filter -lstdc++'
-  _dep_dshow='loader/DirectShow/libDS_Filter.a'
+  _ld_dshow='-Lloader/dshow -lDS_Filter'
+  _dep_dshow='loader/dshow/libDS_Filter.a'
   _codecmodules="directshow $_codecmodules"
 else
   _def_dshow='#undef USE_DIRECTSHOW'

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- Makefile	10 Dec 2001 14:41:41 -0000	1.122
+++ Makefile	10 Dec 2001 22:40:14 -0000	1.123
@@ -57,7 +57,7 @@
 endif
 
 ifneq ($(W32_LIB),)
-PARTS += loader loader/DirectShow
+PARTS += loader loader/dshow
 SRCS_MPLAYER += dll_init.c
 SRCS_MENCODER += dll_init.c
 # SRCS += dll_init.c
@@ -100,6 +100,9 @@
 
 loader/DirectShow/libDS_Filter.a:
 	$(MAKE) -C loader/DirectShow
+
+loader/dshow/libDS_Filter.a:
+	$(MAKE) -C loader/dshow
 
 libmp1e/libmp1e.a:
 	$(MAKE) -C libmp1e