summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-02-03 13:20:54 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-02-03 13:20:54 +0000
commit4b2e0cf38f79d89bb80a996f9c04045e08a7db7a (patch)
tree7b7dafabbf62dad3f70fc2a5ecd3dd3b1cef5567
parentef5bdd60611dfe0db07c85ca5280806d82cc8a2e (diff)
downloadnuttx-4b2e0cf38f79d89bb80a996f9c04045e08a7db7a.tar.gz
nuttx-4b2e0cf38f79d89bb80a996f9c04045e08a7db7a.tar.bz2
nuttx-4b2e0cf38f79d89bb80a996f9c04045e08a7db7a.zip
Fixes for clean pashello compile with z16f
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@622 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/examples/pashello/Makefile9
-rw-r--r--nuttx/examples/pashello/pashello.c1
2 files changed, 9 insertions, 1 deletions
diff --git a/nuttx/examples/pashello/Makefile b/nuttx/examples/pashello/Makefile
index e11bb336c..93fd64991 100644
--- a/nuttx/examples/pashello/Makefile
+++ b/nuttx/examples/pashello/Makefile
@@ -36,7 +36,14 @@
-include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs
-CFLAGS += -I$(TOPDIR)/pcode/include -I$(TOPDIR)/pcode/insn/include
+COMPILER = ${shell basename $(CC)}
+ifeq ($(COMPILER),zneocc.exe)
+USRINCLUDES = -usrinc:'.;$(WTOPDIR)\pcode\include;$(WTOPDIR)\pcode\insn\include'
+else
+USRINCLUDES = -I$(TOPDIR)/pcode/include -I$(TOPDIR)/pcode/insn/include
+endif
+INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES)
ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
diff --git a/nuttx/examples/pashello/pashello.c b/nuttx/examples/pashello/pashello.c
index a40990acd..bff838619 100644
--- a/nuttx/examples/pashello/pashello.c
+++ b/nuttx/examples/pashello/pashello.c
@@ -39,6 +39,7 @@
#include <nuttx/config.h>
#include <stdio.h>
+#include <stdlib.h>
#include <debug.h>
#include "pexec.h"