[MPlayer-cvslog] CVS: main/TOOLS/subfont-c Makefile, 1.8, 1.9 subfont.c, 1.27, 1.28

Diego Biurrun CVS syncmail at mplayerhq.hu
Fri Nov 18 15:57:17 CET 2005


CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/TOOLS/subfont-c
In directory mail:/var2/tmp/cvs-serv16145

Modified Files:
	Makefile subfont.c 
Log Message:
Unify include path handling by adding $(MPROOT) to CFLAGS.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/subfont-c/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile	18 Nov 2005 14:55:37 -0000	1.8
+++ Makefile	18 Nov 2005 14:57:15 -0000	1.9
@@ -4,7 +4,7 @@
 include $(MPROOT)/config.mak
 
 LDLIBS=-lm $(MPROOT)/osdep/timer-lx.o $(shell freetype-config --libs)
-CFLAGS=$(OPTFLAGS) $(shell freetype-config --cflags)
+CFLAGS=$(OPTFLAGS) $(shell freetype-config --cflags) -I$(MPROOT)
 
 #CFLAGS+=-O0			# for RedHat's gcc-2.96-95
 #CFLAGS+=-DOLD_FREETYPE2	# for FreeType 2.0.1

Index: subfont.c
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/subfont-c/subfont.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- subfont.c	28 Aug 2004 20:53:01 -0000	1.27
+++ subfont.c	18 Nov 2005 14:57:15 -0000	1.28
@@ -26,8 +26,8 @@
 #endif
 
 
-#include "../../bswap.h"
-#include "../../osdep/timer.h"
+#include "bswap.h"
+#include "osdep/timer.h"
 
 #ifndef DEBUG
 #define DEBUG	0




More information about the MPlayer-cvslog mailing list