--- trunk/xvidcore/build/generic/Makefile.inc	2002/07/07 10:57:28	264
+++ branches/dev-api-3/xvidcore/build/generic/Makefile.inc	2002/11/07 10:31:03	631
@@ -1,4 +1,4 @@
-LIB=libcore.a
+LIB=libxvidcore.a
 LIBSO=libxvidcore.so
 
 
@@ -49,24 +49,25 @@
 	$(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 \
-	$(SRCDIR)/image/x86_asm/rgb_to_yv12_mmx.asm \
-	$(SRCDIR)/image/x86_asm/yuv_to_yv12_mmx.asm \
-	$(SRCDIR)/image/x86_asm/yuyv_to_yv12_mmx.asm \
-	$(SRCDIR)/image/x86_asm/yv12_to_rgb24_mmx.asm \
-	$(SRCDIR)/image/x86_asm/yv12_to_rgb32_mmx.asm \
-	$(SRCDIR)/image/x86_asm/yv12_to_yuyv_mmx.asm \
+	$(SRCDIR)/image/x86_asm/colorspace_rgb_mmx.asm \
+	$(SRCDIR)/image/x86_asm/colorspace_yuyv_mmx.asm \
+	$(SRCDIR)/image/x86_asm/colorspace_yuv_mmx.asm \
 	$(SRCDIR)/motion/x86_asm/sad_mmx.asm \
 	$(SRCDIR)/quant/x86_asm/quantize4_mmx.asm \
 	$(SRCDIR)/quant/x86_asm/quantize_mmx.asm \
 	$(SRCDIR)/utils/x86_asm/mem_transfer_mmx.asm	\
+	$(SRCDIR)/utils/x86_asm/interlacing_mmx.asm	\
 	\
 	$(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,12 +79,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 \