From 970d030e107e6fc1c931e936121412ce18d57702 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 21 Nov 2012 23:22:38 +0000
Subject: [PATCH] A few more fixes for ez80 Windows Native build (still not
 enough)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5381 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/z80/src/Makefile.zdsii              | 54 ++++++++++++++----------
 binfmt/Makefile                          |  6 +--
 configs/ez80f910200kitg/ostest/Make.defs | 34 ++++++---------
 configs/ez80f910200kitg/src/Makefile     |  2 +-
 4 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/arch/z80/src/Makefile.zdsii b/arch/z80/src/Makefile.zdsii
index dccb48d461..30cb63b14f 100644
--- a/arch/z80/src/Makefile.zdsii
+++ b/arch/z80/src/Makefile.zdsii
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/z16/src/Makefile
+# arch/z80/src/Makefile.zdsii
 #
 #   Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,13 +33,15 @@
 #
 ############################################################################
 
+-include $(TOPDIR)\Make.defs
+
 ############################################################################
 # Tools
 SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched
 ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  USRINCLUDES = -usrinc:'.;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common'
+  USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common"
 else
   WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
   WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
@@ -102,32 +104,30 @@ board$(DELIM)libboard$(LIBEXT):
 nuttx.linkcmd: $(LINKCMDTEMPLATE)
 	$(Q) cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-	@echo "\"$(TOPDIR)/nuttx\"= \\" >>nuttx.linkcmd
-	@echo "  \"$(ARCHSRCDIR)/$(HEAD_OBJ)\", \\" >>nuttx.linkcmd
-	$(Q) ( for lib in $(LINKLIBS); do \
-		echo "  \"$(TOPDIR)/lib/$${lib}\", \\" >>nuttx.linkcmd; \
-	done ; )
-	@echo "  \"$(ARCHSRCDIR)/board/libboard$(LIBEXT)\", \\"  >>nuttx.linkcmd
+	@echo "$(TOPDIR)\nuttx"= \>>nuttx.linkcmd
+	@echo   "$(ARCHSRCDIR)\$(HEAD_OBJ)", \>>nuttx.linkcmd
+	$(Q) for %%G in ($(LINKLIBS)) do ( echo   "$(TOPDIR)\lib\%%G", \>>nuttx.linkcmd; )
+	@echo   "$(ARCHSRCDIR)\board\libboard$(LIBEXT)", \>>nuttx.linkcmd
 ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
-	@echo "  \"$(ZDSSTDLIBDIR)/chelprevaaD$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSSTDLIBDIR)/crtrevaaLDD$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSSTDLIBDIR)/fprevaaLDD$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSZILOGLIBDIR)/csiorevaaLDD$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSZILOGLIBDIR)/zsldevinitdummy$(LIBEXT)\""  >>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\chelprevaaD$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\crtrevaaLDD$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\fprevaaLDD$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSZILOGLIBDIR)\csiorevaaLDD$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSZILOGLIBDIR)\zsldevinitdummy$(LIBEXT)">>nuttx.linkcmd
 endif
 ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
-	@echo "  \"$(ZDSSTDLIBDIR)/chelpD$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSSTDLIBDIR)/crtLDD$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSSTDLIBDIR)/fpdumyLD$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSZILOGLIBDIR)/csioLDD$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSZILOGLIBDIR)/zsldevinitdummy$(LIBEXT)\""  >>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\chelpD$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\crtLDD$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\fpdumyLD$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSZILOGLIBDIR)\csioLDD$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSZILOGLIBDIR)\zsldevinitdummy$(LIBEXT)">>nuttx.linkcmd
 endif
 ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
-	@echo "  \"$(ZDSSTDLIBDIR)/chelp$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSSTDLIBDIR)/crt$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSSTDLIBDIR)/fplib$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSZILOGLIBDIR)/gpio$(LIBEXT)\", \\"  >>nuttx.linkcmd
-	@echo "  \"$(ZDSZILOGLIBDIR)/uartf91$(LIBEXT)\""  >>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\chelp$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\crt$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\fplib$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSZILOGLIBDIR)\gpio$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSZILOGLIBDIR)\uartf91$(LIBEXT)">>nuttx.linkcmd
 endif
 else
 	@echo "\"${shell cygpath -w "$(TOPDIR)/nuttx\"= \\" >>nuttx.linkcmd
@@ -193,9 +193,13 @@ endif
 depend: .depend
 
 clean:
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+	$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" clean )
+else
 	$(Q) if [ -e board$(DELIM)Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
 	fi
+endif
 	$(call DELFILE, nuttx.linkcmd)
 	$(call DELFILE, *.asm)
 	$(call DELFILE, *.tmp)
@@ -204,9 +208,13 @@ clean:
 	$(call CLEAN)
 
 distclean: clean
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+	$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean )
+else
 	$(Q) if [ -e board$(DELIM)Makefile ]; then \
 		$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
 	fi
+endif
 	$(call DELFILE, Make.dep)
 	$(call DELFILE, .depend)
 
diff --git a/binfmt/Makefile b/binfmt/Makefile
index a59392fb05..317d4a422f 100644
--- a/binfmt/Makefile
+++ b/binfmt/Makefile
@@ -38,7 +38,7 @@
 ifeq ($(WINTOOL),y)
 INCDIROPT		= -w
 endif
-CFLAGS			+= ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/sched}
+CFLAGS			+= ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)sched}
 
 # Basic BINFMT source files 
 
@@ -58,8 +58,8 @@ VPATH			=
 SUBDIRS			=
 DEPPATH			= --dep-path .
 
-include libnxflat/Make.defs
-include libelf/Make.defs
+include libnxflat$(DELIM)Make.defs
+include libelf$(DELIM)Make.defs
 
 BINFMT_AOBJS	= $(BINFMT_ASRCS:.S=$(OBJEXT))
 BINFMT_COBJS	= $(BINFMT_CSRCS:.c=$(OBJEXT))
diff --git a/configs/ez80f910200kitg/ostest/Make.defs b/configs/ez80f910200kitg/ostest/Make.defs
index 54e377de7e..141a45e4ce 100644
--- a/configs/ez80f910200kitg/ostest/Make.defs
+++ b/configs/ez80f910200kitg/ostest/Make.defs
@@ -39,30 +39,25 @@ include ${TOPDIR}/tools/Config.mk
 # These are the directories where the ZDS-II toolchain is installed
 
 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
-
-  # Escaped versions
-
-  # ETOPDIR := ${shell echo "$(TOPDIR)" | sed -e "s/ /%%%%20/g"}
-  # EZDSSTDINCDIR := ${shell echo "$(ZDSSTDINCDIR)" | sed -e "s/ /%%%%20/g"}
-  # EZDSZILOGINCDIR := ${shell echo "$(ZDSZILOGINCDIR)" | sed -e "s/ /%%%%20/g"}
+  ZDSINSTALLDIR := C:/PROGRA~2/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
+  INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
+  ZDSBINDIR := $(INSTALLDIR)\bin
+  ZDSSTDINCDIR := $(INSTALLDIR)\include\std
+  ZDSZILOGINCDIR := $(INSTALLDIR)\include\zilog
+  ZDSSTDLIBDIR := $(INSTALLDIR)\lib\std
+  ZDSZILOGLIBDIR := $(INSTALLDIR)\lib\zilog
 
   # CFLAGs
 
   ARCHASMINCLUDES = -include:'$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)'
-  # EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
   EARCHASMINCLUDES = -include:'$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)'
-  ARCHSTDINCLUDES = -stdinc:'$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)'
-  ARCHUSRINCLUDES = -usrinc:'.'
+  ARCHSTDINCLUDES = -stdinc:"$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)"
+  ARCHUSRINCLUDES = -usrinc:.
 else
   WINTOOL := y
+  ZDSINSTALLDIR := C:/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_$(ZDSVERSION)
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
   ZDSBINDIR := $(INSTALLDIR)/bin
   ZDSSTDINCDIR := $(INSTALLDIR)/include/std
@@ -96,9 +91,9 @@ endif
 # Assembler definitions
 
 ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)
-ARCHCPU = eZ80F91
-ARCHCPUDEF = _EZ80F91
-ARCHFAMILY = _EZ80ACCLAIM!
+  ARCHCPU = eZ80F91
+  ARCHCPUDEF = _EZ80F91
+  ARCHFAMILY = _EZ80ACCLAIM!
 endif
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
@@ -111,8 +106,7 @@ ARCHASMCPUFLAGS = -cpu:$(ARCHCPU) -NOigcase
 ARCHASMLIST = -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS = -warn
 ARCHASMDEFINES = -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
-AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
-		 $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
 
 # Compiler definitions
 
diff --git a/configs/ez80f910200kitg/src/Makefile b/configs/ez80f910200kitg/src/Makefile
index 12c39824e5..f023e14185 100644
--- a/configs/ez80f910200kitg/src/Makefile
+++ b/configs/ez80f910200kitg/src/Makefile
@@ -39,7 +39,7 @@ SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched
 ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  USRINCLUDES = -usrinc:'.;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common'
+  USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common"
 else
   WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
   WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}