From 2b5f9fddad65745d00c53e2a737391c41e3a9f27 Mon Sep 17 00:00:00 2001 From: patacongo Date: Tue, 8 Jan 2008 13:02:47 +0000 Subject: [PATCH] ZNeo compiler now works git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@525 42af7a65-404d-4744-a932-0658087f49c3 --- configs/z16f2800100zcog/Make.defs | 11 ++++++----- configs/z16f2800100zcog/setenv.sh | 2 +- configs/z16f2800100zcog/src/Makefile | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/configs/z16f2800100zcog/Make.defs b/configs/z16f2800100zcog/Make.defs index a690606cae..569a9f0e46 100644 --- a/configs/z16f2800100zcog/Make.defs +++ b/configs/z16f2800100zcog/Make.defs @@ -36,6 +36,7 @@ include ${TOPDIR}/.config ZDSINSTALLDIR = C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.10.2 +ZDSBINDIR = $(ZDSINSTALLDIR)/bin ZDSLIBDIR = $(ZDSINSTALLDIR)/lib/std ZDSINCDIR = $(ZDSINSTALLDIR)/include @@ -72,11 +73,11 @@ CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) CROSSDEV = -CC = zneocc -CPP = zneoasm -LD = zneolink -AS = zneoasm -AR = zneolib +CC = $(ZDSBINDIR)/zneocc.exe +CPP = $(ZDSBINDIR)/zneoasm.exe +LD = $(ZDSBINDIR)/zneolink.exe +AS = $(ZDSBINDIR)/zneoasm.exe +AR = $(ZDSBINDIR)/zneolib.exe ASMEXT = .asm OBJEXT = .obj diff --git a/configs/z16f2800100zcog/setenv.sh b/configs/z16f2800100zcog/setenv.sh index 6ab843c2ed..e0c18d13a2 100755 --- a/configs/z16f2800100zcog/setenv.sh +++ b/configs/z16f2800100zcog/setenv.sh @@ -41,6 +41,6 @@ if [ -z ${PATH_ORIG} ]; then export PATH_ORIG=${PATH}; fi WD=`pwd` ZDSINSTALLDIR="C:/Program\ Files/ZiLOG/ZDSII_ZNEO_4.10.2" -export PATH=${ZDSINSTALLDIR}/bin:/sbin:/usr/sbin:${PATH_ORIG} +export PATH="${ZDSINSTALLDIR}/bin:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/configs/z16f2800100zcog/src/Makefile b/configs/z16f2800100zcog/src/Makefile index 96acd71010..be3eedd310 100644 --- a/configs/z16f2800100zcog/src/Makefile +++ b/configs/z16f2800100zcog/src/Makefile @@ -57,13 +57,13 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libboard$(LIBEXT): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(AR) $@ $${obj} || \ { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep touch $@ depend: .depend