--- trunk/xvidcore/build/generic/Makefile.inc	2002/07/16 11:02:17	298
+++ trunk/xvidcore/build/generic/Makefile.inc	2002/09/07 09:19:07	438
@@ -1,4 +1,4 @@
-LIB=libcore.a
+LIB=libxvidcore.a
 LIBSO=libxvidcore.so
 
 
@@ -20,7 +20,6 @@
 	$(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,6 +48,7 @@
 	$(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 \
@@ -65,8 +65,10 @@
 	\
 	$(SRCDIR)/image/x86_asm/interpolate8x8_xmm.asm	\
 	$(SRCDIR)/motion/x86_asm/sad_xmm.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 
 	
 DIRS_INTEL = \
 	$(SRCDIR)/bitstream/x86_asm/*.o \
@@ -78,13 +80,21 @@
 
 SRC_IA64 = \
 	$(SRCDIR)/dct/ia64_asm/fdct_ia64.s \
-	$(SRCDIR)/dct/ia64_asm/idct_ia64.s \
 	$(SRCDIR)/image/ia64_asm/interpolate8x8_ia64.s \
 	$(SRCDIR)/motion/ia64_asm/sad_ia64.s \
 	$(SRCDIR)/motion/ia64_asm/halfpel8_refine_ia64.s \
 	$(SRCDIR)/quant/ia64_asm/quant_h263_ia64.s \
 	$(SRCDIR)/utils/ia64_asm/mem_transfer_ia64.s
 
+ifeq ($(CC),ecc)
+SRC_IA64 += \
+	$(SRCDIR)/dct/ia64_asm/idct_ia64_ecc.s 
+else
+SRC_IA64 += \
+	$(SRCDIR)/dct/ia64_asm/idct_ia64_gcc.s 
+endif
+
+
 DIRS_IA64 = \
 	$(SRCDIR)/dct/ia64_asm/*.o \
 	$(SRCDIR)/image/ia64_asm/*.o \