diff options
-rw-r--r-- | Makefile | 18 | ||||
-rwxr-xr-x | configure | 24 |
2 files changed, 33 insertions, 9 deletions
@@ -34,7 +34,7 @@ all: version.h $(PRG) $(PRG_CFG) # $(PRG_AVIP) .c.o: - $(CC) -c $(CFLAGS) -DUSE_DIRECTSHOW -o $@ $< + $(CC) -c $(CFLAGS) -o $@ $< COMMONLIBS = libvo/libvo.a libac3/libac3.a mp3lib/libMP3.a @@ -62,17 +62,17 @@ opendivx/libdecore.a: encore/libencore.a: $(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): .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_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_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_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 $(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML @@ -101,6 +101,10 @@ params: --disable-select disable audio select() support ( for example required this 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 --with-csslibdir=DIR directory contains libcss.so shared library @@ -207,6 +211,7 @@ _svga=no _fbdev=yes _lirc=no _css=no +_dshow=yes _x=1 _y=1 @@ -604,6 +609,9 @@ do --disable-select) _select='#undef HAVE_AUDIO_SELECT' ;; + --disable-dshow) + _dshow=no + ;; --with-win32libdir=*) _win32libdir=`echo $ac_option | cut -d '=' -f 2` _win32libdirnotify=no @@ -660,6 +668,7 @@ echo "Checking for SVGAlib ... $_svga" echo "Checking for FBDev ... $_fbdev" echo "Checking for DeCSS support ... $_css" echo "Checking for PNG support ... $_png" +echo "Checking for DirectShow ... $_dshow" # write conf files. if [ $_gl = yes ]; then @@ -684,6 +693,16 @@ else _cssinc='' 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 _x11lib='-lX11 -lXext -lXdpms' @@ -758,6 +777,8 @@ LIRC_LIBS = $_lirclibs CSS_LIB = $_csslib CSS_INC = $_cssinc WIN32_PATH=-DWIN32_PATH=\"$_win32libdir\" +DS_DEP = $_dshowdep +DS_LIB = $_dshowlib EOF # echo 'CFLAGS=$(OPTFLAGS) -Wall -DMPG12PLAY' >> config.mak @@ -951,6 +972,9 @@ $_css /* 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 byte first (like Motorola and SPARC, unlike Intel and VAX). */ /* #define WORDS_BIGENDIAN */ |