From 371d1d6b10395cee6666d554b18f5df245df5c9f Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 3 Dec 2008 20:53:23 +0000
Subject: Add support for bitmap fonts

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1408 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/graphics/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'nuttx/graphics')

diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile
index cb581f000..1b4ab8ce6 100644
--- a/nuttx/graphics/Makefile
+++ b/nuttx/graphics/Makefile
@@ -60,10 +60,14 @@ include nxtk/Make.defs
 DEPPATH		+= --dep-path nxtk
 CFLAGS		+= ${shell $(TOPDIR)/tools/incdir.sh "$(CC)" $(TOPDIR)/graphics/nxtk}
 
-ASRCS		= $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS) $(NXTK_ASRCS)
+include nxfonts/Make.defs
+DEPPATH		+= --dep-path nxfonts
+CFLAGS		+= ${shell $(TOPDIR)/tools/incdir.sh "$(CC)" $(TOPDIR)/graphics/nxfonts}
+
+ASRCS		= $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS) $(NXTK_ASRCS) $(NXFONTS_ASRCS)
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 
-CSRCS		= $(NXGLIB_CSRCS) $(NXBE_CSRCS) $(NX_CSRCS) $(NXTK_CSRCS)
+CSRCS		= $(NXGLIB_CSRCS) $(NXBE_CSRCS) $(NX_CSRCS) $(NXTK_CSRCS) $(NXFONTS_CSRCS)
 COBJS		= $(CSRCS:.c=$(OBJEXT))
 
 SRCS		= $(ASRCS) $(CSRCS)
@@ -72,9 +76,9 @@ OBJS		= $(AOBJS) $(COBJS)
 BIN		= libgraphics$(LIBEXT)
 
 ifeq ($(CONFIG_NX_MULTIUSER),y)
-VPATH		= nxglib:nxbe:nxmu:nxtk
+VPATH		= nxglib:nxbe:nxmu:nxtk:nxfonts
 else
-VPATH		= nxglib:nxbe:nxsu:nxtk
+VPATH		= nxglib:nxbe:nxsu:nxtk:nxfonts
 endif
 
 all:	mklibgraphics
-- 
cgit v1.2.3