Author: diego Date: Sat Nov 25 01:31:07 2006 New Revision: 21201 Removed: trunk/loader/dmo/Makefile trunk/loader/dshow/Makefile Modified: trunk/Makefile trunk/loader/Makefile Log: Make loader Makefile non-recursive. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Sat Nov 25 01:31:07 2006 @@ -107,8 +107,8 @@ 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 @@ 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 @@ 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]) Modified: trunk/loader/Makefile ============================================================================== --- trunk/loader/Makefile (original) +++ trunk/loader/Makefile Sat Nov 25 01:31:07 2006 @@ -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 @@ 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 @@ $(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