# HG changeset patch
# User glantau
# Date 995918814 0
# Node ID 2e2c46c87460910d6844bfccbbdbfa46d456a377
# Parent  383bfb30fc8464fb54d7e0f8b36ab9682d29edff
fixed config for direct mplayer build compatibility

diff -r 383bfb30fc84 -r 2e2c46c87460 Makefile
--- a/Makefile	Mon Jul 23 18:58:11 2001 +0000
+++ b/Makefile	Mon Jul 23 20:06:54 2001 +0000
@@ -1,11 +1,13 @@
-include ../config.mk
-CFLAGS= -O2 -Wall -g
+include ../config.mak
+
+CFLAGS= $(OPTFLAGS) -Wall -g
 LDFLAGS= -g
 
 OBJS= common.o utils.o mpegvideo.o h263.o jrevdct.o jfdctfst.o \
       mpegaudio.o ac3enc.o mjpegenc.o resample.o dsputil.o \
       motion_est.o imgconvert.o imgresample.o msmpeg4.o \
       mpeg12.o h263dec.o rv10.o
+ASM_OBJS=
 
 # currently using libac3 for ac3 decoding
 OBJS+= ac3dec.o \
@@ -18,19 +20,22 @@
        mpglib/dct64_i386.o mpglib/decode_i386.o  mpglib/tabinit.o
 
 # i386 mmx specific stuff
-ifdef CONFIG_MMX
-OBJS += i386/fdct_mmx.o i386/fdctdata.o i386/sad_mmx.o i386/cputest.o \
+ifeq ($(TARGET_MMX),yes)
+ASM_OBJS += i386/fdct_mmx.o i386/sad_mmx.o
+OBJS += i386/fdctdata.o i386/cputest.o \
 	i386/dsputil_mmx.o
 endif
 
+SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
+
 LIB= libavcodec.a
 TESTS= imgresample-test dct-test
 
 all: $(LIB) apiexample
 
-$(LIB): $(OBJS)
+$(LIB): $(OBJS) $(ASM_OBJS)
 	rm -f $@
-	$(AR) rcs $@ $(OBJS)
+	$(AR) rcs $@ $(OBJS) $(ASM_OBJS)
 
 dsputil.o: dsputil.c dsputil.h
 
@@ -40,12 +45,21 @@
 %.o: %.s
 	nasm -f elf -o $@ $<
 
+# depend only used by mplayer now
+dep:	depend
+
+depend:
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
 clean: 
 	rm -f *.o *~ *.a i386/*.o i386/*~ \
            libac3/*.o libac3/*~ \
            mpglib/*.o mpglib/*~ \
            apiexample $(TESTS)
 
+distclean: clean
+	rm -f Makefile.bak .depend
+
 # api example program
 apiexample: apiexample.c $(LIB)
 	$(CC) $(CFLAGS) -o $@ $< $(LIB) -lm
diff -r 383bfb30fc84 -r 2e2c46c87460 common.h
--- a/common.h	Mon Jul 23 18:58:11 2001 +0000
+++ b/common.h	Mon Jul 23 20:06:54 2001 +0000
@@ -3,8 +3,8 @@
 
 #include "../config.h"
 
-#ifndef USE_LIBAVCODEC
-// workaround for typedef conflict in MPlayer
+#ifndef __WINE_WINDEF16_H
+/* workaround for typedef conflict in MPlayer (wine typedefs) */
 typedef unsigned short UINT16;
 typedef signed short INT16;
 #endif
diff -r 383bfb30fc84 -r 2e2c46c87460 dsputil.c
--- a/dsputil.c	Mon Jul 23 18:58:11 2001 +0000
+++ b/dsputil.c	Mon Jul 23 20:06:54 2001 +0000
@@ -21,7 +21,7 @@
 #include "avcodec.h"
 #include "dsputil.h"
 
-#ifdef CONFIG_MMX
+#ifdef HAVE_MMX
 int mm_flags; /* multimedia extension flags */
 #endif
 
@@ -377,7 +377,7 @@
     pix_abs16x16_xy2 = pix_abs16x16_xy2_c;
     av_fdct = jpeg_fdct_ifast;
 
-#ifdef CONFIG_MMX
+#ifdef HAVE_MMX
     dsputil_init_mmx();
 #endif
 }
diff -r 383bfb30fc84 -r 2e2c46c87460 dsputil.h
--- a/dsputil.h	Mon Jul 23 18:58:11 2001 +0000
+++ b/dsputil.h	Mon Jul 23 20:06:54 2001 +0000
@@ -61,7 +61,7 @@
 int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h);
 int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx, int h);
 
-#ifdef CONFIG_MMX
+#ifdef HAVE_MMX
 
 #define MM_MMX    0x0001 /* standard MMX */
 #define MM_3DNOW  0x0004 /* AMD 3DNOW */
diff -r 383bfb30fc84 -r 2e2c46c87460 imgresample.c
--- a/imgresample.c	Mon Jul 23 18:58:11 2001 +0000
+++ b/imgresample.c	Mon Jul 23 20:06:54 2001 +0000
@@ -130,7 +130,7 @@
     }
 }
 
-#ifdef CONFIG_MMX
+#ifdef HAVE_MMX
 
 #include "i386/mmx.h"
 
@@ -317,7 +317,7 @@
     } else {
         n = dst_width;
     }
-#ifdef CONFIG_MMX
+#ifdef HAVE_MMX
     if ((mm_flags & MM_MMX) && NB_TAPS == 4)
         h_resample_fast4_mmx(dst, n, 
                              src, src_width, src_start, src_incr, filters);
@@ -374,7 +374,7 @@
         }
         /* apply vertical filter */
         phase_y = get_phase(src_y);
-#ifdef CONFIG_MMX
+#ifdef HAVE_MMX
         /* desactivated MMX because loss of precision */
         if ((mm_flags & MM_MMX) && NB_TAPS == 4 && 0)
             v_resample4_mmx(output, owidth, 
@@ -516,7 +516,7 @@
     }
 }
 
-#ifdef CONFIG_MMX
+#ifdef HAVE_MMX
 int mm_flags;
 #endif
 
@@ -588,7 +588,7 @@
     }
 
     /* mmx test */
-#ifdef CONFIG_MMX
+#ifdef HAVE_MMX
     printf("MMX test\n");
     fact = 0.72;
     xsize = (int)(XSIZE * fact);
diff -r 383bfb30fc84 -r 2e2c46c87460 motion_est.c
--- a/motion_est.c	Mon Jul 23 18:58:11 2001 +0000
+++ b/motion_est.c	Mon Jul 23 20:06:54 2001 +0000
@@ -434,7 +434,7 @@
 	dmin = phods_motion_search(s, &mx, &my, range / 2, xmin, ymin, xmax, ymax);
         break;
     }
-#ifdef CONFIG_MMX
+#ifdef HAVE_MMX
     if (mm_flags & MM_MMX)
         emms();
 #endif