# HG changeset patch # User mswitch # Date 1005737725 0 # Node ID 4c2db939183e73430fe4b20fb607badf4b1fdf0f # Parent 283eab7c4c8e95a29f0d42f92b0294ade9cc26bf Had to remove ao_mpegpes.c from the Makefile since it depends on libvo/vo_mpegpes and doesn't like libvo2 =). diff -r 283eab7c4c8e -r 4c2db939183e configure --- a/configure Wed Nov 14 11:16:45 2001 +0000 +++ b/configure Wed Nov 14 11:35:25 2001 +0000 @@ -2531,6 +2531,7 @@ _volib='-Llibvo -lvo' _voinc='-Ilibvo' _vodir='libvo' + _aosrc=$_aosrc' ao_mpegpes.c' fi if test "$_dxr3" = yes ; then diff -r 283eab7c4c8e -r 4c2db939183e libao2/Makefile --- a/libao2/Makefile Wed Nov 14 11:16:45 2001 +0000 +++ b/libao2/Makefile Wed Nov 14 11:35:25 2001 +0000 @@ -4,7 +4,7 @@ LIBNAME = libao2.a # TODO: moveout ao_sdl.c so it's only used when SDL is detected -SRCS=afmt.c audio_out.c ao_mpegpes.c ao_null.c ao_pcm.c $(OPTIONAL_SRCS) +SRCS=afmt.c audio_out.c ao_null.c ao_pcm.c $(OPTIONAL_SRCS) OBJS=$(SRCS:.c=.o) CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(EXTRA_INC)