diff options
author | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-15 12:13:53 +0000 |
---|---|---|
committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-15 12:13:53 +0000 |
commit | b01493a577ff9c23d9e3bd25667e881fc18268d1 (patch) | |
tree | fe3e166b1ea81a8ce16b043c883aafb0b628a98c | |
parent | a3c3bca337f4a1d1055a791299de125a7cbf9d4f (diff) | |
download | mpv-b01493a577ff9c23d9e3bd25667e881fc18268d1.tar.bz2 mpv-b01493a577ff9c23d9e3bd25667e881fc18268d1.tar.xz |
Fix xvidix for non-x11 systems, 10l Alex :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4169 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 5 | ||||
-rw-r--r-- | libvo/Makefile | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -2754,8 +2754,13 @@ test "$_debug" && _def_debug='#define MP_DEBUG 1' _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 --git a/libvo/Makefile b/libvo/Makefile index 2aec540037..194cd3cb46 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -7,7 +7,7 @@ SRCS=aspect.c aclib.c osd.c font_load.c video_out.c vo_null.c vo_pgm.c vo_md5.c 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 |