--- trunk/xvidcore/build/generic/Makefile.dj	2002/03/08 02:46:11	3
+++ branches/dev-api-3/xvidcore/build/generic/Makefile.dj	2002/11/07 10:31:03	631
@@ -11,7 +11,7 @@
 
 
 CC = gcc
-CFLAGS = -Wall -DARCH_X86
+CFLAGS = -Wall -DARCH_X86 -DBFRAMES
 # CFLAGS += -funroll-loops -ffast-math -fstrict-aliasing -fomit-frame-pointer
 # CFLAGS += -fPIC
 # CFLAGS += -m486
@@ -20,9 +20,9 @@
 
 
 AS = nasm
-AFLAGS = -f coff -DPREFIX
+AFLAGS = -f coff -DPREFIX -DFORMAT_COFF
 %.o: %.asm
-	$(AS) $(AFLAGS) $< -o $@
+	$(AS) $(AFLAGS) -I$(<D) $< -o $@
 
 
 RM = deltree /y
@@ -37,12 +37,19 @@
 
 clean:
 	$(RM) $(SRCDIR)/*.o
-	$(RM) $(SRCDIR)/common/*.o
-	$(RM) $(SRCDIR)/decoder/*.o
-	$(RM) $(SRCDIR)/encoder/*.o
+	$(RM) $(SRCDIR)/bitstream/*.o
+	$(RM) $(SRCDIR)/dct/*.o
 	$(RM) $(SRCDIR)/image/*.o
-	$(RM) $(SRCDIR)/common/intel_mmx/*.o
-	$(RM) $(SRCDIR)/decoder/intel_mmx/*.o
-	$(RM) $(SRCDIR)/encoder/intel_mmx/*.o
-	$(RM) $(SRCDIR)/image/intel_mmx/*.o
+	$(RM) $(SRCDIR)/motion/*.o
+	$(RM) $(SRCDIR)/prediction/*.o
+	$(RM) $(SRCDIR)/quant/*.o
+	$(RM) $(SRCDIR)/utils/*.o
+	$(RM) $(SRCDIR)/bitstream/x86_asm/*.o
+	$(RM) $(SRCDIR)/dct/x86_asm/*.o
+	$(RM) $(SRCDIR)/image/x86_asm/*.o
+	$(RM) $(SRCDIR)/motion/x86_asm/*.o
+	$(RM) $(SRCDIR)/quant/x86_asm/*.o
+	$(RM) $(SRCDIR)/utils/x86_asm/*.o
 	$(RM) $(LIB)
+
+