diff options
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | loader/Makefile | 25 | ||||
| -rw-r--r-- | loader/dmo/Makefile | 48 | ||||
| -rw-r--r-- | loader/dshow/Makefile | 53 |
4 files changed, 25 insertions, 114 deletions
@@ -107,8 +107,8 @@ COMMON_LIBS += libpostproc/libpostproc.a PARTS += libpostproc endif ifeq ($(WIN32DLL),yes) -COMMON_LIBS += loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a -PARTS += loader loader/dshow loader/dmo +COMMON_LIBS += loader/libloader.a +PARTS += loader endif ifeq ($(MP3LIB),yes) COMMON_LIBS += mp3lib/libMP3.a @@ -205,12 +205,6 @@ stream/stream.a: libmpcodecs/libmpcodecs.a: $(MAKE) -C libmpcodecs -loader/dshow/libDS_Filter.a: - $(MAKE) -C loader/dshow - -loader/dmo/libDMO_Filter.a: - $(MAKE) -C loader/dmo - libavutil/libavutil.a: $(MAKE) -C libavutil LIBPREF=lib LIBSUF=.a @@ -445,9 +439,6 @@ mp3lib/libMP3.a: .norecurse $(wildcard mp3lib/*.[ch]) libfaad2/libfaad2.a: .norecurse $(wildcard libfaad2/*.[ch] libfaad2/*/*.[ch]) loader/libloader.a: .norecurse $(wildcard loader/*.[chSs]) -loader/dmo/libDMO_Filter.a: .norecurse $(wildcard loader/dmo/*.[ch]) -loader/dshow/libDS_Filter.a: .norecurse $(wildcard loader/dshow/*.[ch]) - libdha/libdha.so: .norecurse $(wildcard libdha/*.[ch]) vidix/libvidix.a: .norecurse $(wildcard vidix/*.[ch]) Gui/libgui.a: .norecurse $(wildcard Gui/*.[ch] Gui/*/*.[ch] Gui/*/*/*.[ch]) diff --git a/loader/Makefile b/loader/Makefile index 0f8ab351e1..4fe5842529 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -1,6 +1,6 @@ include ../config.mak -CFLAGS=-I. -I.. -DMPLAYER -D__WINE__ $(OPTFLAGS) +CFLAGS=-I. -I.. -Idshow -DMPLAYER -D__WINE__ -DNOAVIFILE_HEADERS $(OPTFLAGS) #CFLAGS+=-Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT SRCS= driver.c afl.c vfl.c @@ -9,7 +9,21 @@ SRCS+= ldt_keeper.c pe_image.c module.c ext.c win32.c \ pe_resource.c resource.c registry.c elfdll.c wrapper.S stubs.s endif -OBJS = $(SRCS:.c=.o) +SRCS+= dshow/DS_AudioDecoder.c \ + dshow/DS_Filter.c \ + dshow/DS_VideoDecoder.c \ + dshow/allocator.c \ + dshow/cmediasample.c \ + dshow/guids.c \ + dshow/inputpin.c \ + dshow/outputpin.c \ + dmo/DMO_AudioDecoder.c \ + dmo/DMO_VideoDecoder.c \ + dmo/buffer.c \ + dmo/dmo.c \ + dmo/dmo_guids.c \ + +OBJS = $(SRCS:.c=.o) OBJS := $(OBJS:.S=.o) OBJS := $(OBJS:.s=.o) @@ -19,11 +33,18 @@ libloader.a: $(OBJS) $(AR) -r $@ $^ $(RANLIB) $@ +dshow/test: libloader.a + $(CC) dshow/test.c $(CFLAGS) -o $@ $^ -lstdc++ + clean: rm -f *.o *.a *~ + rm -f dshow/*.o dshow/*.a dshow/*~ + rm -f dmo/*.o dmo/*.a dmo/*~ distclean: clean rm -f .depend + rm -f dshow/.depend dshow/test dshow/test.raw + rm -f dmo/.depend dep depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend diff --git a/loader/dmo/Makefile b/loader/dmo/Makefile deleted file mode 100644 index 4a2528fa24..0000000000 --- a/loader/dmo/Makefile +++ /dev/null @@ -1,48 +0,0 @@ - -LIBNAME = libDMO_Filter.a - -include ../../config.mak - -# DS_AudioDec.c -SRCS = DMO_AudioDecoder.c \ - DMO_VideoDecoder.c \ - buffer.c \ - dmo.c \ - dmo_guids.c \ - -OBJS = $(SRCS:.c=.o) - -INCLUDE = -I. -I../dshow -I.. -CFLAGS = $(INCLUDE) $(OPTFLAGS) -DNOAVIFILE_HEADERS - -.SUFFIXES: .c .o - -# .PHONY: all clean - -.c.o: - $(CC) -c $(CFLAGS) -o $@ $< - -$(LIBNAME): $(OBJS) - $(AR) r $(LIBNAME) $(OBJS) - -test: test.c $(LIBNAME) - $(CC) test.c $(CFLAGS) -o test ./libDMO_Filter.a ../libloader.a -lstdc++ - -all: $(LIBNAME) - -clean: - rm -f *.o *.a *~ - -distclean: clean - rm -f .depend test test.raw - -dep depend: - $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend - -# -# include dependency files if they exist -# -ifneq ($(wildcard .depend),) -include .depend -endif - diff --git a/loader/dshow/Makefile b/loader/dshow/Makefile deleted file mode 100644 index b532e09fc4..0000000000 --- a/loader/dshow/Makefile +++ /dev/null @@ -1,53 +0,0 @@ - -LIBNAME = libDS_Filter.a - -include ../../config.mak - -# DS_AudioDec.c -SRCS = DS_AudioDecoder.c \ - DS_Filter.c \ - DS_VideoDecoder.c \ - allocator.c \ - cmediasample.c \ - guids.c \ - inputpin.c \ - outputpin.c \ - -OBJS = $(SRCS:.c=.o) - -# OBJS = DS_AudioDec.o DS_VideoDec.o DS_Filter.o allocator.o cmediasample.o guids.o inputpin.o outputpin.o - -INCLUDE = -I. -I.. -CFLAGS = $(INCLUDE) $(OPTFLAGS) -DNOAVIFILE_HEADERS - -.SUFFIXES: .c .o - -# .PHONY: all clean - -.c.o: - $(CC) -c $(CFLAGS) -o $@ $< - -$(LIBNAME): $(OBJS) - $(AR) r $(LIBNAME) $(OBJS) - -test: test.c $(LIBNAME) - $(CC) test.c $(CFLAGS) -o test ./libDS_Filter.a ../libloader.a -lstdc++ - -all: $(LIBNAME) - -clean: - rm -f *.o *.a *~ - -distclean: clean - rm -f .depend test test.raw - -dep depend: - $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend - -# -# include dependency files if they exist -# -ifneq ($(wildcard .depend),) -include .depend -endif - |