# HG changeset patch # User atmos4 # Date 1011096833 0 # Node ID 2d8403f1c54e1fb15159ea5be912c3d82fb1718b # Parent 36fb2dcd3ccc6509d47953d3b068a8ea9a6bf39d Fix xvidix for non-x11 systems, 10l Alex :) diff -r 36fb2dcd3ccc -r 2d8403f1c54e configure --- a/configure Tue Jan 15 12:10:19 2002 +0000 +++ b/configure Tue Jan 15 12:13:53 2002 +0000 @@ -2754,8 +2754,13 @@ _def_linux='#undef TARGET_LINUX' linux && _def_linux='#define TARGET_LINUX 1' +# TODO cleanup the vidix stuff here _def_vidix='#define CONFIG_VIDIX 1' test "$_vidix" = no && _def_vidix='#undef CONFIG_VIDIX' +if test "$_vidix" = yes && test "$_x11" = yes; then + _vosrc="$_vosrc vo_xvidux.c" + _vomodules="xvidix $_vomodules" +fi echo Checking for vidix ... "$_vidix" ############################################################################# echo "Creating config.mak" diff -r 36fb2dcd3ccc -r 2d8403f1c54e libvo/Makefile --- a/libvo/Makefile Tue Jan 15 12:10:19 2002 +0000 +++ b/libvo/Makefile Tue Jan 15 12:13:53 2002 +0000 @@ -7,7 +7,7 @@ OBJS=$(SRCS:.c=.o) ifeq ($(VIDIX),yes) -SRCS += vosub_vidix.c vo_xvidix.c +SRCS += vosub_vidix.c endif CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DVB_INC) -DMPG12PLAY #-Wall