From a044876adfe88cb63bdb313f5d1894e158f4e8ad Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 18 Nov 2005 14:57:15 +0000 Subject: [PATCH] Unify include path handling by adding $(MPROOT) to CFLAGS. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17015 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/subfont-c/Makefile | 2 +- TOOLS/subfont-c/subfont.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TOOLS/subfont-c/Makefile b/TOOLS/subfont-c/Makefile index b93a23b837..dbdef85449 100644 --- a/TOOLS/subfont-c/Makefile +++ b/TOOLS/subfont-c/Makefile @@ -4,7 +4,7 @@ MPROOT=../.. 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 diff --git a/TOOLS/subfont-c/subfont.c b/TOOLS/subfont-c/subfont.c index 0ac14ba6cb..f958855d22 100644 --- a/TOOLS/subfont-c/subfont.c +++ b/TOOLS/subfont-c/subfont.c @@ -26,8 +26,8 @@ #endif -#include "../../bswap.h" -#include "../../osdep/timer.h" +#include "bswap.h" +#include "osdep/timer.h" #ifndef DEBUG #define DEBUG 0