[MPlayer-dev-eng] [PATCH] fix for mplayer rev. 1.696

[Bernd Ernesti]

Hi,

in mplayer.c

revision 1.696
date: 2003/05/30 17:53:03;  author: alex;  state: Exp;  lines: +11 -1
warning fixes by Dominik Mierzejewski <dominik at rangers.eu.org>

#ifdef HAVE_X11
#include "libvo/x11_common.h"
#endif

and some other code was added, but the Makefile wasn't changed
to include $(X11_INC) in CFLAGS and now mplayer.c won't compile:

In file included from mplayer.c:53:
libvo/x11_common.h:7: warning: No include path in which to find X11/Xlib.h
libvo/x11_common.h:8: warning: No include path in which to find X11/Xutil.h
In file included from mplayer.c:53:
libvo/x11_common.h:7: warning: No include path in which to find X11/Xlib.h
libvo/x11_common.h:8: warning: No include path in which to find X11/Xutil.h
[..]
 
Please also apply the attached patch. 
 
Bernd

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.266
diff -b -u -r1.266 Makefile
--- Makefile	30 May 2003 18:23:52 -0000	1.266
+++ Makefile	30 May 2003 23:45:55 -0000
@@ -38,7 +38,7 @@
 CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(MATROSKA_LIB) 
 COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB)
 
-CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(FRIBIDI_INC) # -Wall
+CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) # -Wall
 
 ifeq ($(TARGET_ALTIVEC),yes)
 ifeq ($(TARGET_OS),Darwin)