aboutsummaryrefslogtreecommitdiff
path: root/nuttx/graphics/Makefile
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-03-26 22:10:21 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-03-26 22:10:21 +0000
commit5c2c73f6f583b18604d5d5b8e2e132c52e7cfd47 (patch)
tree944155d15d445099ed9a21737b66dbd8b747eed8 /nuttx/graphics/Makefile
parent4bbb82261c44446fd10042307b87cd20c1f43ff2 (diff)
downloadpx4-firmware-5c2c73f6f583b18604d5d5b8e2e132c52e7cfd47.tar.gz
px4-firmware-5c2c73f6f583b18604d5d5b8e2e132c52e7cfd47.tar.bz2
px4-firmware-5c2c73f6f583b18604d5d5b8e2e132c52e7cfd47.zip
Add beginnings of an NX console driver
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4524 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/graphics/Makefile')
-rw-r--r--nuttx/graphics/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile
index d64b7661f..590e41ffa 100644
--- a/nuttx/graphics/Makefile
+++ b/nuttx/graphics/Makefile
@@ -68,10 +68,14 @@ include nxfonts/Make.defs
DEPPATH += --dep-path nxfonts
CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxfonts}
-ASRCS = $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS) $(NXTK_ASRCS) $(NXFONTS_ASRCS)
+include nxconsole/Make.defs
+DEPPATH += --dep-path nxconsole
+CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxconsole}
+
+ASRCS = $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS) $(NXTK_ASRCS) $(NXFONTS_ASRCS) $(NXCON_ASRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT))
-CSRCS = $(NXGLIB_CSRCS) $(NXBE_CSRCS) $(NX_CSRCS) $(NXTK_CSRCS) $(NXFONTS_CSRCS)
+CSRCS = $(NXGLIB_CSRCS) $(NXBE_CSRCS) $(NX_CSRCS) $(NXTK_CSRCS) $(NXFONTS_CSRCS) $(NXCON_CSRCS)
COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
@@ -80,9 +84,9 @@ OBJS = $(AOBJS) $(COBJS)
BIN = libgraphics$(LIBEXT)
ifeq ($(CONFIG_NX_MULTIUSER),y)
-VPATH = nxglib:nxbe:nxmu:nxtk:nxfonts
+VPATH = nxglib:nxbe:nxmu:nxtk:nxfonts:nxconsole
else
-VPATH = nxglib:nxbe:nxsu:nxtk:nxfonts
+VPATH = nxglib:nxbe:nxsu:nxtk:nxfonts:nxconsole
endif
all: mklibgraphics