--- trunk/xvidcore/build/generic/sources.inc	2004/03/18 16:11:28	1381
+++ trunk/xvidcore/build/generic/sources.inc	2004/03/22 22:36:25	1382
@@ -1,88 +1,100 @@
-SRCDIR = ../../src
+SRC_DIR = ../../src
 
 SRC_GENERIC = \
- 	$(SRCDIR)/decoder.c \
-	$(SRCDIR)/encoder.c \
-	$(SRCDIR)/xvid.c \
-	$(SRCDIR)/bitstream/bitstream.c \
-	$(SRCDIR)/bitstream/cbp.c \
-	$(SRCDIR)/bitstream/mbcoding.c \
-	$(SRCDIR)/dct/fdct.c \
-	$(SRCDIR)/dct/idct.c \
-	$(SRCDIR)/dct/simple_idct.c \
-	$(SRCDIR)/image/colorspace.c \
-	$(SRCDIR)/image/image.c \
-	$(SRCDIR)/image/interpolate8x8.c \
-	$(SRCDIR)/image/reduced.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 \
-	$(SRCDIR)/quant/quant_h263.c \
-	$(SRCDIR)/quant/quant_matrix.c \
-	$(SRCDIR)/quant/quant_mpeg4.c \
-	$(SRCDIR)/utils/emms.c \
-	$(SRCDIR)/utils/mbtransquant.c \
-	$(SRCDIR)/utils/mem_align.c \
-	$(SRCDIR)/utils/mem_transfer.c \
-	$(SRCDIR)/utils/ratecontrol.c \
-	$(SRCDIR)/utils/timer.c
-
-SRC_DIVX4COMPAT = \
-	$(SRCDIR)/divx4.c
+ 	decoder.c \
+	encoder.c \
+	xvid.c \
+	bitstream/bitstream.c \
+	bitstream/cbp.c \
+	bitstream/mbcoding.c \
+	dct/fdct.c \
+	dct/idct.c \
+	dct/simple_idct.c \
+	image/colorspace.c \
+	image/image.c \
+	image/interpolate8x8.c \
+	image/font.c \
+	image/postprocessing.c \
+	image/qpel.c \
+	image/reduced.c \
+	motion/estimation_bvop.c \
+	motion/estimation_common.c \
+	motion/estimation_gmc.c \
+	motion/estimation_pvop.c \
+	motion/estimation_rd_based.c \
+	motion/gmc.c \
+	motion/motion_comp.c \
+	motion/vop_type_decision.c \
+	motion/sad.c \
+	prediction/mbprediction.c \
+	plugins/plugin_single.c \
+	plugins/plugin_2pass1.c \
+	plugins/plugin_2pass2.c \
+	plugins/plugin_lumimasking.c \
+	plugins/plugin_dump.c \
+	plugins/plugin_psnr.c \
+	quant/quant_h263.c \
+	quant/quant_matrix.c \
+	quant/quant_mpeg.c \
+	utils/emms.c \
+	utils/mbtransquant.c \
+	utils/mem_align.c \
+	utils/mem_transfer.c \
+	utils/timer.c
 
 SRC_IA32 = \
-	$(SRCDIR)/utils/x86_asm/cpuid.asm \
-	\
-	$(SRCDIR)/bitstream/x86_asm/cbp_mmx.asm \
-	$(SRCDIR)/dct/x86_asm/fdct_mmx.asm \
-	$(SRCDIR)/dct/x86_asm/fdct_xmm.asm \
-	$(SRCDIR)/dct/x86_asm/idct_mmx.asm \
-	$(SRCDIR)/dct/x86_asm/simple_idct_mmx.asm \
-	$(SRCDIR)/image/x86_asm/interpolate8x8_mmx.asm \
-	$(SRCDIR)/image/x86_asm/reduced_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)/bitstream/x86_asm/cbp_sse2.asm \
-	$(SRCDIR)/motion/x86_asm/sad_sse2.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
+	bitstream/x86_asm/cbp_3dne.asm \
+	bitstream/x86_asm/cbp_mmx.asm \
+	bitstream/x86_asm/cbp_sse2.asm \
+	dct/x86_asm/fdct_mmx_ffmpeg.asm \
+	dct/x86_asm/fdct_mmx_skal.asm \
+	dct/x86_asm/fdct_sse2_skal.asm \
+	dct/x86_asm/idct_3dne.asm \
+	dct/x86_asm/idct_mmx.asm \
+	dct/x86_asm/idct_sse2_dmitry.asm \
+	dct/x86_asm/simple_idct_mmx.asm \
+	image/x86_asm/colorspace_rgb_mmx.asm \
+	image/x86_asm/colorspace_yuv_mmx.asm \
+	image/x86_asm/colorspace_yuyv_mmx.asm \
+	image/x86_asm/interpolate8x8_3dn.asm \
+	image/x86_asm/interpolate8x8_3dne.asm \
+	image/x86_asm/interpolate8x8_mmx.asm \
+	image/x86_asm/interpolate8x8_xmm.asm \
+	image/x86_asm/reduced_mmx.asm \
+	image/x86_asm/qpel_mmx.asm \
+	motion/x86_asm/sad_xmm.asm \
+	motion/x86_asm/sad_sse2.asm \
+	motion/x86_asm/sad_mmx.asm \
+	motion/x86_asm/sad_3dne.asm \
+	motion/x86_asm/sad_3dn.asm \
+	quant/x86_asm/quantize_h263_mmx.asm \
+	quant/x86_asm/quantize_h263_3dne.asm \
+	quant/x86_asm/quantize_mpeg_xmm.asm \
+	quant/x86_asm/quantize_mpeg_mmx.asm \
+	utils/x86_asm/mem_transfer_mmx.asm \
+	utils/x86_asm/mem_transfer_3dne.asm \
+	utils/x86_asm/interlacing_mmx.asm \
+	utils/x86_asm/cpuid.asm
 
 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
+	dct/ia64_asm/fdct_ia64.s \
+	image/ia64_asm/interpolate8x8_ia64.s \
+	motion/ia64_asm/sad_ia64.s \
+	motion/ia64_asm/halfpel8_refine_ia64.s \
+	quant/ia64_asm/quant_h263_ia64.s \
+	utils/ia64_asm/mem_transfer_ia64.s
+
+SRC_IA64_IDCT_GCC = \
+	dct/ia64_asm/idct_ia64_gcc.s
+
+SRC_IA64_IDCT_ECC = \
+	dct/ia64_asm/idct_ia64_ecc.s
 
 SRC_PPC = \
-	$(SRCDIR)/bitstream/ppc_asm/cbp_ppc.s
+	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)/motion/ppc_asm/sad_altivec.s
+	bitstream/ppc_asm/cbp_altivec.s \
+	dct/ppc_asm/fdct_altivec.s \
+	dct/ppc_asm/idct_altivec.s \
+	motion/ppc_asm/sad_altivec.s