From 7180aab679c696c75a75939034789645d15da0b2 Mon Sep 17 00:00:00 2001 From: arpi_esp Date: Fri, 30 Mar 2001 03:06:46 +0000 Subject: [PATCH] DShow is the default now git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@258 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 20 +++++++---- Makefile.No-DS | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 Makefile.No-DS diff --git a/Makefile b/Makefile index 5f512dd362..840069e260 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +# DirectShow support (test code) +# make -f makefile.DS + # LINUX Makefile made by A'rpi / Astral # Some cleanup by LGB: * 'make -C dir' instead of 'cd dir;make;cd..' # * for loops instead of linear sequence of make directories @@ -17,8 +20,8 @@ PRG_TV = tvision prefix = /usr/local BINDIR = ${prefix}/bin # BINDIR = /usr/local/bin -SRCS = linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c -OBJS = linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o +SRCS = subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c +OBJS = subreader.o linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 VO_LIBS = -Llibvo -lvo $(X_LIBS) @@ -31,13 +34,16 @@ all: $(PRG) # $(PRG_AVIP) .c.o: - $(CC) -c $(CFLAGS) -o $@ $< + $(CC) -c $(CFLAGS) -DUSE_DIRECTSHOW -o $@ $< COMMONLIBS = libvo/libvo.a libac3/libac3.a mp3lib/libMP3.a loader/libloader.a: $(MAKE) -C loader +loader/DirectShow/libDS_Filter.a: + $(MAKE) -C loader/DirectShow + libmpeg2/libmpeg2.a: $(MAKE) -C libmpeg2 @@ -56,8 +62,8 @@ opendivx/libdecore.a: encore/libencore.a: $(MAKE) -C encore -$(PRG): .depend mplayer.o $(OBJS) loader/libloader.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 -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread +$(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) -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 @@ -76,13 +82,13 @@ clean: rm -f *.o *~ $(OBJS) distclean: - @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader drivers drivers/syncfb ; do $(MAKE) -C $$a distclean ; done + @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader loader/DirectShow drivers drivers/syncfb ; do $(MAKE) -C $$a distclean ; done rm -f *~ $(PRG) $(PRG_HQ) $(PRG_AVIP) $(PRG_TV) $(OBJS) *.o *.a .depend dep: depend depend: .depend - @for a in mp3lib libac3 libmpeg2 libvo opendivx encore ; do $(MAKE) -C $$a dep ; done + @for a in mp3lib libac3 libmpeg2 libvo opendivx encore loader/DirectShow ; do $(MAKE) -C $$a dep ; done .depend: Makefile config.mak config.h makedepend -f- -- $(CFLAGS) -- mplayer.c mplayerHQ.c aviparse.c tvision.c $(SRCS) 1>.depend 2>/dev/null diff --git a/Makefile.No-DS b/Makefile.No-DS new file mode 100644 index 0000000000..5f512dd362 --- /dev/null +++ b/Makefile.No-DS @@ -0,0 +1,95 @@ +# LINUX Makefile made by A'rpi / Astral +# Some cleanup by LGB: * 'make -C dir' instead of 'cd dir;make;cd..' +# * for loops instead of linear sequence of make directories +# * some minor problems with make clean and distclean were corrected + +include config.mak + +#install... +OWNER = root +GROUP = root +PERM = 755 + +PRG = mplayer +PRG_HQ = mplayerHQ +PRG_AVIP = aviparse +PRG_TV = tvision +prefix = /usr/local +BINDIR = ${prefix}/bin +# BINDIR = /usr/local/bin +SRCS = linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c +OBJS = linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o +CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall +A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 +VO_LIBS = -Llibvo -lvo $(X_LIBS) + +.SUFFIXES: .c .o + +# .PHONY: all clean + +all: $(PRG) +# $(PRG_AVIP) + +.c.o: + $(CC) -c $(CFLAGS) -o $@ $< + +COMMONLIBS = libvo/libvo.a libac3/libac3.a mp3lib/libMP3.a + +loader/libloader.a: + $(MAKE) -C loader + +libmpeg2/libmpeg2.a: + $(MAKE) -C libmpeg2 + +libvo/libvo.a: + $(MAKE) -C libvo + +libac3/libac3.a: + $(MAKE) -C libac3 + +mp3lib/libMP3.a: + $(MAKE) -C mp3lib + +opendivx/libdecore.a: + $(MAKE) -C opendivx + +encore/libencore.a: + $(MAKE) -C encore + +$(PRG): .depend mplayer.o $(OBJS) loader/libloader.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 -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_TV): .depend tvision.o $(OBJS) $(COMMONLIBS) + $(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS) + +install: $(PRG) + install -g $(GROUP) -o $(OWNER) -m $(PERM) -s $(PRG) $(BINDIR) + install -D -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1 + +clean: + rm -f *.o *~ $(OBJS) + +distclean: + @for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader drivers drivers/syncfb ; do $(MAKE) -C $$a distclean ; done + rm -f *~ $(PRG) $(PRG_HQ) $(PRG_AVIP) $(PRG_TV) $(OBJS) *.o *.a .depend + +dep: depend + +depend: .depend + @for a in mp3lib libac3 libmpeg2 libvo opendivx encore ; do $(MAKE) -C $$a dep ; done + +.depend: Makefile config.mak config.h + makedepend -f- -- $(CFLAGS) -- mplayer.c mplayerHQ.c aviparse.c tvision.c $(SRCS) 1>.depend 2>/dev/null + +# +# include dependency files if they exist +# +ifneq ($(wildcard .depend),) +include .depend +endif