[MPlayer-cvslog] r32914 - in trunk: Makefile gui/skin/font.c

[ib]

Author: ib
Date: Wed Feb 16 19:10:04 2011
New Revision: 32914

Log:
Revert r32911.

Modified:
   trunk/Makefile
   trunk/gui/skin/font.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Feb 16 18:19:28 2011	(r32913)
+++ trunk/Makefile	Wed Feb 16 19:10:04 2011	(r32914)
@@ -856,7 +856,7 @@ mpcommon.o osdep/mplayer-rc.o: version.h
 
 osdep/mplayer-rc.o: osdep/mplayer.exe.manifest
 
-gui/%: CFLAGS += -Igui -Wno-strict-prototypes
+gui/%: CFLAGS += -Wno-strict-prototypes
 
 libdvdcss/%:   CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
 libdvdnav/%:   CFLAGS := -Ilibdvdnav -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)

Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c	Wed Feb 16 18:19:28 2011	(r32913)
+++ trunk/gui/skin/font.c	Wed Feb 16 19:10:04 2011	(r32914)
@@ -24,7 +24,7 @@
 #include "font.h"
 #include "cut.h"
 #include "mp_msg.h"
-#include "interface.h"
+#include "../interface.h"
 #include "libavutil/avstring.h"
 
 bmpFont * Fonts[MAX_FONTS] = {};