[Mplayer-cvslog] CVS: main configure,1.30,1.31 Makefile,1.23,1.24

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv3710

Modified Files:
	configure Makefile 
Log Message:
DShow support selection is now by ./configure --disable-dshow

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** configure	2001/04/23 16:13:46	1.30
--- configure	2001/04/24 22:51:55	1.31
***************
*** 102,105 ****
--- 102,109 ----
  	                        option ALSA or Vortex2 driver )
  
+ 	--disable-dshow         disable DirectShow support (if you don't have
+                                 C++ compiler&libs, or you've found dshow codecs
+                                 slower than old VfW ones)
+ 
          --with-x11libdir=DIR    X library files are in DIR
          --with-win32libdir=DIR  windows codec files
***************
*** 208,211 ****
--- 212,216 ----
  _lirc=no
  _css=no
+ _dshow=yes
  
  _x=1
***************
*** 605,608 ****
--- 610,616 ----
          _select='#undef HAVE_AUDIO_SELECT'
  	;;
+   --disable-dshow)
+         _dshow=no
+ 	;;
    --with-win32libdir=*)
          _win32libdir=`echo $ac_option | cut -d '=' -f 2`
***************
*** 661,664 ****
--- 669,673 ----
  echo "Checking for DeCSS support ... $_css"
  echo "Checking for PNG support ... $_png"
+ echo "Checking for DirectShow ... $_dshow"
  # write conf files.
  
***************
*** 685,688 ****
--- 694,707 ----
  fi
  
+ if [ $_dshow = yes ]; then
+    _dshowlib='-Lloader/DirectShow -lDS_Filter -lstdc++'
+    _dshowdep='loader/DirectShow/libDS_Filter.a'
+    _dshow='#define USE_DIRECTSHOW'
+ else
+    _dshowlib=''
+    _dshowdep=''
+    _dshow='#undef USE_DIRECTSHOW'
+ fi
+ 
  if [ $_x11 = yes ]; then
    if [ $_xdpms = yes ]; then
***************
*** 759,762 ****
--- 778,783 ----
  CSS_INC = $_cssinc
  WIN32_PATH=-DWIN32_PATH=\"$_win32libdir\"
+ DS_DEP = $_dshowdep
+ DS_LIB = $_dshowlib
  
  EOF
***************
*** 951,954 ****
--- 972,978 ----
  /* Define this to enable MPEG 1/2 image postprocessing (requires FAST cpu!) */
  #define MPEG12_POSTPROC
+ 
+ /* DirectShow support */
+ $_dshow
  
  /* Define if your processor stores words with the most significant

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** Makefile	2001/04/24 02:20:02	1.23
--- Makefile	2001/04/24 22:51:55	1.24
***************
*** 35,39 ****
  
  .c.o:
! 	$(CC) -c $(CFLAGS) -DUSE_DIRECTSHOW -o $@ $<
  
  COMMONLIBS = libvo/libvo.a libac3/libac3.a mp3lib/libMP3.a
--- 35,39 ----
  
  .c.o:
! 	$(CC) -c $(CFLAGS) -o $@ $<
  
  COMMONLIBS = libvo/libvo.a libac3/libac3.a mp3lib/libMP3.a
***************
*** 63,77 ****
  	$(MAKE) -C encore
  
! $(PRG):	.depend mplayer.o $(OBJS) loader/libloader.a loader/DirectShow/libDS_Filter.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
! 	$(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -Lloader/DirectShow -lDS_Filter -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) $(CSS_LIB) -Lencore -lencore -lpthread -lstdc++
  
! $(PRG_HQ):	.depend mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
! 	$(CC) $(CFLAGS) -o $(PRG_HQ) mplayerHQ.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread
  
! $(PRG_AVIP):	.depend aviparse.o $(OBJS) loader/libloader.a $(COMMONLIBS)
! 	$(CC) $(CFLAGS) -o $(PRG_AVIP) aviparse.o $(OBJS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl $(VO_LIBS) -lpthread
  
! $(PRG_TV):	.depend tvision.o $(OBJS) $(COMMONLIBS)
! 	$(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS)
  
  $(PRG_CFG):        .depend codec-cfg.c codec-cfg.h
--- 63,77 ----
  	$(MAKE) -C encore
  
! $(PRG):	.depend mplayer.o $(OBJS) loader/libloader.a $(DS_DEP) libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
! 	$(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader $(DS_LIB) -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) $(CSS_LIB) -Lencore -lencore -lpthread
  
! # $(PRG_HQ):	.depend mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
! # 	$(CC) $(CFLAGS) -o $(PRG_HQ) mplayerHQ.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread
  
! # $(PRG_AVIP):	.depend aviparse.o $(OBJS) loader/libloader.a $(COMMONLIBS)
! # 	$(CC) $(CFLAGS) -o $(PRG_AVIP) aviparse.o $(OBJS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -ldl $(VO_LIBS) -lpthread
  
! # $(PRG_TV):	.depend tvision.o $(OBJS) $(COMMONLIBS)
! # 	$(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS)
  
  $(PRG_CFG):        .depend codec-cfg.c codec-cfg.h


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog