From 96e153c0d29b1ab3657948e280faa25e864b28c5 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Sun, 11 Nov 2012 23:44:31 +0000
Subject: Correct some issues with last check-in; ez80 still does not build

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5339 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/configs/ez80f910200zco/nsh/Make.defs | 54 ++++++++++++++++++------------
 nuttx/configs/ez80f910200zco/nsh/setenv.sh | 14 ++++----
 2 files changed, 39 insertions(+), 29 deletions(-)

(limited to 'nuttx/configs/ez80f910200zco/nsh')

diff --git a/nuttx/configs/ez80f910200zco/nsh/Make.defs b/nuttx/configs/ez80f910200zco/nsh/Make.defs
index 469baeb1a..91c900b33 100644
--- a/nuttx/configs/ez80f910200zco/nsh/Make.defs
+++ b/nuttx/configs/ez80f910200zco/nsh/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/ez80f910200zco/nst/Make.defs
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,23 +38,33 @@ include ${TOPDIR}/tools/Config.mk
 
 # These are the directories where the ZDS-II toolchain is installed
 
-ZDSVERSION		:= 4.11.1
-ZDSINSTALLDIR		:= C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
-ZDSBINDIR		:= $(ZDSINSTALLDIR)/bin
-ZDSSTDINCDIR		:= $(ZDSINSTALLDIR)/include/std
-ZDSZILOGINCDIR		:= $(ZDSINSTALLDIR)/include/zilog
-ZDSSTDLIBDIR		:= $(ZDSINSTALLDIR)/lib/std
-ZDSZILOGLIBDIR		:= $(ZDSINSTALLDIR)/lib/zilog
+ZDSVERSION := 5.1.1
+ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  ZDSBINDIR := $(ZDSINSTALLDIR)\bin
+  ZDSSTDINCDIR := $(ZDSINSTALLDIR)\include\std
+  ZDSZILOGINCDIR := $(ZDSINSTALLDIR)\include\zilog
+  ZDSSTDLIBDIR := $(ZDSINSTALLDIR)\lib\std
+  ZDSZILOGLIBDIR := $(ZDSINSTALLDIR)\lib\zilog
+else
+  WINTOOL := y
+  INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
+  ZDSBINDIR := $(INSTALLDIR)/bin
+  ZDSSTDINCDIR := $(INSTALLDIR)/include/std
+  ZDSZILOGINCDIR := $(INSTALLDIR)/include/zilog
+  ZDSSTDLIBDIR := $(INSTALLDIR)/lib/std
+  ZDSZILOGLIBDIR := $(INSTALLDIR)/lib/zilog
+endif
 
 # These are the same directories but with the directory separator
 # character swapped as needed by the ZDS-II compiler
 
-WINTOOL			:= y
-WTOPDIR 		:= ${shell cygpath -w $(TOPDIR)}
-WZDSSTDINCDIR		:= ${shell cygpath -w $(ZDSSTDINCDIR)}
-WZDSZILOGINCDIR 	:= ${shell cygpath -w $(ZDSZILOGINCDIR)}
-WZDSSTDLIBDIR		:= ${shell cygpath -w $(ZDSSTDLIBDIR)}
-WZDSZILOGLIBDIR 	:= ${shell cygpath -w $(ZDSZILOGLIBDIR)}
+WTOPDIR := ${shell cygpath -w "$(TOPDIR)"}
+WZDSSTDINCDIR := ${shell cygpath -w "$(ZDSSTDINCDIR)"}
+WZDSZILOGINCDIR := ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
+WZDSSTDLIBDIR := ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
+WZDSZILOGLIBDIR := ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
 
 # Escaped versions
 
@@ -140,35 +150,35 @@ HEXEXT			= .hex
 
 define PREPROCESS
 	@echo "CPP: $1->$2"
-	@$(CPP) $(CPPFLAGS) $1 -o $2
+	$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
 endef
 
 define COMPILE
 	@#echo "CC: $1"
-	@(wfile=`cygpath -w $1`; $(CC) $(CFLAGS) $$wfile)
+	$(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
 endef
 
 define ASSEMBLE
 	@#echo "AS: $1"
-	@(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile)
+	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
 define ARCHIVE
 	echo "AR: $2";
-	$(Q) for %%G in ($(subst ",,$(2))) do ( $(AR) $(ARFLAGS) $1=-+%%G )
+	$(Q) for %%G in ($(subst ",,$(2))) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
 endef
 else
 define ARCHIVE
-	$(Q) for __obj in $(2); do \
-		echo "AR: $(__obj)"; \
-		$(AR) $(ARFLAGS) $1=-+$(__obj) || { echo "$(AR) $1=-+$(__obj) FAILED!" ; exit 1 ; } \
+	$(Q) for __obj in $(subst ",,$(2)) ; do \
+		echo "AR: $$__obj"; \
+		"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
 	done
 endef
 endif
 
 define CLEAN
-	@rm -f *.obj *.src *.lib *.hex *.lod *.lst
+	$(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
 endef
 
 # This is the tool to use for dependencies (i.e., none)
diff --git a/nuttx/configs/ez80f910200zco/nsh/setenv.sh b/nuttx/configs/ez80f910200zco/nsh/setenv.sh
index 37bc6e3aa..8bfe02b2f 100755
--- a/nuttx/configs/ez80f910200zco/nsh/setenv.sh
+++ b/nuttx/configs/ez80f910200zco/nsh/setenv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # configs/ez80f910200zco/nst/setenv.sh
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -42,11 +42,11 @@ fi
 # The ZDS-II toolchain lies outside of the Cygwin "sandbox" and
 # attempts to set the PATH variable do not have the desired effect.
 # Instead, alias are provided for all of the ZDS-II command line tools.
-# Version 4.10.1 installed in the default location is assumed here.
+# Version 5.1.1 installed in the default location is assumed here.
 #
-ZDSBINDIR="C:/Program\ Files/ZiLOG/ZDSII_eZ80Acclaim!_4.11.1/bin"
-alias ez8asm="${ZDSBINDIR}/ez8asm.exe"
-alias ez8cc="${ZDSBINDIR}/ez8cc.exe"
-alias ez8lib="${ZDSBINDIR}/ez8lib.exe"
-alias ez8link="${ZDSBINDIR}/ez8link.exe"
+ZDSBINDIR="C:/Program\ Files\ \(x86\)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1/bin"
+alias ez80asm="${ZDSBINDIR}/ez80asm.exe"
+alias ez80cc="${ZDSBINDIR}/ez80cc.exe"
+alias ez80lib="${ZDSBINDIR}/ez80lib.exe"
+alias ez80link="${ZDSBINDIR}/ez80link.exe"
 
-- 
cgit v1.2.3