--- trunk/xvidcore/build/generic/Makefile.inc 2002/07/18 13:41:16 307 +++ branches/dev-api-3/xvidcore/build/generic/Makefile.inc 2002/12/20 00:25:09 732 @@ -1,4 +1,4 @@ -LIB=libcore.a +LIB=libxvidcore.a LIBSO=libxvidcore.so @@ -17,10 +17,8 @@ $(SRCDIR)/image/colorspace.c \ $(SRCDIR)/image/image.c \ $(SRCDIR)/image/interpolate8x8.c \ - $(SRCDIR)/image/font.c \ $(SRCDIR)/motion/motion_comp.c \ $(SRCDIR)/motion/motion_est.c \ - $(SRCDIR)/motion/smp_motion_est.c \ $(SRCDIR)/motion/sad.c \ $(SRCDIR)/prediction/mbprediction.c \ $(SRCDIR)/quant/adapt_quant.c \ @@ -49,7 +47,6 @@ $(SRCDIR)/utils/x86_asm/cpuid.asm \ \ $(SRCDIR)/bitstream/x86_asm/cbp_mmx.asm \ - $(SRCDIR)/bitstream/x86_asm/cbp_sse2.asm \ $(SRCDIR)/dct/x86_asm/fdct_mmx.asm \ $(SRCDIR)/dct/x86_asm/idct_mmx.asm \ $(SRCDIR)/image/x86_asm/interpolate8x8_mmx.asm \ @@ -66,9 +63,20 @@ \ $(SRCDIR)/image/x86_asm/interpolate8x8_xmm.asm \ $(SRCDIR)/motion/x86_asm/sad_xmm.asm \ + \ + $(SRCDIR)/bitstream/x86_asm/cbp_sse2.asm \ $(SRCDIR)/motion/x86_asm/sad_sse2.asm \ \ - $(SRCDIR)/image/x86_asm/interpolate8x8_3dn.asm + $(SRCDIR)/image/x86_asm/interpolate8x8_3dn.asm \ + $(SRCDIR)/motion/x86_asm/sad_3dn.asm \ + \ + $(SRCDIR)/bitstream/x86_asm/cbp_3dne.asm \ + $(SRCDIR)/dct/x86_asm/idct_3dne.asm \ + $(SRCDIR)/image/x86_asm/interpolate8x8_3dne.asm \ + $(SRCDIR)/motion/x86_asm/sad_3dne.asm \ + $(SRCDIR)/quant/x86_asm/quantize4_xmm.asm \ + $(SRCDIR)/quant/x86_asm/quantize_3dne.asm \ + $(SRCDIR)/utils/x86_asm/mem_transfer_3dne.asm DIRS_INTEL = \ $(SRCDIR)/bitstream/x86_asm/*.o \