Mercurial > mplayer.hg

changeset 32827:2b0b38bfda8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert r32911.
author ib
date Wed, 16 Feb 2011 18:10:04 +0000
parents 9ce10a293f56
children 819c51338f75
files Makefile gui/skin/font.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Feb 16 17:19:28 2011 +0000
+++ b/Makefile	Wed Feb 16 18:10:04 2011 +0000
@@ -856,7 +856,7 @@
 
 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)
--- a/gui/skin/font.c	Wed Feb 16 17:19:28 2011 +0000
+++ b/gui/skin/font.c	Wed Feb 16 18:10:04 2011 +0000
@@ -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] = {};