--- trunk/xvidcore/build/generic/Makefile.inc 2002/03/28 16:14:23 77 +++ trunk/xvidcore/build/generic/Makefile.inc 2002/09/10 23:08:12 474 @@ -1,4 +1,4 @@ -LIB=libcore.a +LIB=libxvidcore.a LIBSO=libxvidcore.so @@ -43,9 +43,11 @@ $(SRCDIR)/quant/*.o \ $(SRCDIR)/utils/*.o - SRC_INTEL = \ + $(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 \ @@ -58,10 +60,15 @@ $(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/cpuid.asm \ - $(SRCDIR)/utils/x86_asm/mem_transfer_mmx.asm - - + $(SRCDIR)/utils/x86_asm/mem_transfer_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)/motion/x86_asm/sad_3dn.asm + DIRS_INTEL = \ $(SRCDIR)/bitstream/x86_asm/*.o \ $(SRCDIR)/dct/x86_asm/*.o \ @@ -70,13 +77,38 @@ $(SRCDIR)/quant/x86_asm/*.o \ $(SRCDIR)/utils/x86_asm/*.o +SRC_IA64 = \ + $(SRCDIR)/dct/ia64_asm/fdct_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 \ + $(SRCDIR)/motion/ia64_asm/*.o \ + $(SRCDIR)/quant/ia64_asm/*.o \ + $(SRCDIR)/utils/ia64_asm/*.o + SRC_PPC = \ $(SRCDIR)/bitstream/ppc_asm/cbp_ppc.s SRC_ALTIVEC = \ $(SRCDIR)/bitstream/ppc_asm/cbp_altivec.s \ $(SRCDIR)/dct/ppc_asm/fdct_altivec.s \ - $(SRCDIR)/dct/ppc_asm/idct_altivec.s + $(SRCDIR)/dct/ppc_asm/idct_altivec.s \ + $(SRCDIR)/motion/ppc_asm/sad_altivec.s DIRS_PPC = \