[XviD-devel] dev-api-3 tree broken...

[Rémi Guyomarch]

--EVF5PPMfhYS0aIcm
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

... on my FreeBSD box but probably on every non-win32 systems too.

Attached is a patch which at least makes the generated library
linkable with mplayer / mencoder.

-- 
Rémi
--EVF5PPMfhYS0aIcm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch.txt"

--- build/generic/Makefile.inc	20 Dec 2002 00:25:09 -0000	1.15.2.5
+++ build/generic/Makefile.inc	22 Dec 2002 22:32:12 -0000
@@ -5,7 +5,7 @@
 SRCDIR = ../../src
 
 SRC = \
- 	$(SRCDIR)/decoder.c \
+	$(SRCDIR)/decoder.c \
 	$(SRCDIR)/divx4.c \
 	$(SRCDIR)/encoder.c \
 	$(SRCDIR)/xvid.c \
@@ -17,8 +17,11 @@
 	$(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 \
@@ -49,17 +52,20 @@
 	$(SRCDIR)/bitstream/x86_asm/cbp_mmx.asm \
 	$(SRCDIR)/dct/x86_asm/fdct_mmx.asm \
 	$(SRCDIR)/dct/x86_asm/idct_mmx.asm \
+	$(SRCDIR)/image/x86_asm/colorspace_yuv_mmx.asm \
+	$(SRCDIR)/image/x86_asm/colorspace_rgb_mmx.asm \
+	$(SRCDIR)/image/x86_asm/colorspace_yuyv_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/reduced_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)/utils/x86_asm/mem_transfer_mmx.asm \
 	\
 	$(SRCDIR)/image/x86_asm/interpolate8x8_xmm.asm	\
 	$(SRCDIR)/motion/x86_asm/sad_xmm.asm \
@@ -77,7 +83,7 @@
 	$(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 \
 	$(SRCDIR)/dct/x86_asm/*.o \
--- src/bitstream/x86_asm/cbp_3dne.asm	19 Dec 2002 00:38:56 -0000	1.1.2.1
+++ src/bitstream/x86_asm/cbp_3dne.asm	22 Dec 2002 22:32:12 -0000
@@ -40,7 +40,7 @@
 
 section .data
 %macro cglobal 1
-	%if 1
+	%ifdef PREFIX
 		global _%1
 		%define %1 _%1
 	%else
--- src/motion/x86_asm/sad_3dne.asm	19 Dec 2002 00:40:19 -0000	1.1.2.1
+++ src/motion/x86_asm/sad_3dne.asm	22 Dec 2002 22:32:12 -0000
@@ -38,7 +38,7 @@
 bits 32
 
 %macro cglobal 1 
-	%if 1
+	%ifdef PREFIX
 		global _%1 
 		%define %1 _%1
 	%else

--EVF5PPMfhYS0aIcm--