summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-16 14:03:54 +0000
committeratmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-16 14:03:54 +0000
commit0b8054d7ade30371f66b047e7f4a80b073e0fe39 (patch)
tree086c963e29a1ce83f96843d3c56cfdc01b21c53d
parentc52d76675a350fd613ef156ff6cbf9ef98bfdd86 (diff)
downloadmpv-0b8054d7ade30371f66b047e7f4a80b073e0fe39.tar.bz2
mpv-0b8054d7ade30371f66b047e7f4a80b073e0fe39.tar.xz
wtf..10l to dunno..only use x11_common.c when x11 is detected
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6451 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure2
-rw-r--r--libvo/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index c8304230ba..8de7144f7b 100755
--- a/configure
+++ b/configure
@@ -2087,7 +2087,7 @@ EOF
fi
if test "$_x11" = yes ; then
_def_x11='#define HAVE_X11 1'
- _vosrc="$_vosrc vo_x11.c"
+ _vosrc="$_vosrc x11_common.c vo_x11.c"
_vomodules="x11 $_vomodules"
else
_def_x11='#undef HAVE_X11'
diff --git a/libvo/Makefile b/libvo/Makefile
index c236430f8a..15772009ef 100644
--- a/libvo/Makefile
+++ b/libvo/Makefile
@@ -3,7 +3,7 @@ include config.mak
LIBNAME = libvo.a
-SRCS=aspect.c aclib.c osd.c font_load.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c x11_common.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c
+SRCS=aspect.c aclib.c osd.c font_load.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c
OBJS=$(SRCS:.c=.o)
ifeq ($(VIDIX),yes)