Update for ez80 Windows native build (still does not work)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5377 42af7a65-404d-4744-a932-0658087f49c3

6 files changed, 242 insertions, 99 deletions

diff --git a/nuttx/configs/ez80f910200kitg/README.txt b/nuttx/configs/ez80f910200kitg/README.txt
index 3c0b16e34..2bac3c5db 100644
--- a/nuttx/configs/ez80f910200kitg/README.txt
+++ b/nuttx/configs/ez80f910200kitg/README.txt
@@ -83,13 +83,28 @@ available:
     This builds the examples/ostest application for execution from FLASH.
     See examples/README.txt for information about ostest.
 
-    This configuration uses the mconf-based configuration tool.  To
-    change this configuration using that tool, you should:
+    NOTES:
 
-    a. Build and install the mconf tool.  See nuttx/README.txt and
-       misc/tools/
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configuration using that tool, you should:
 
-    b. Execute 'make menuconfig' in nuttx/ in order to start the
-       reconfiguration process.
+       a. Build and install the mconf tool.  See nuttx/README.txt and
+          misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. By default, this configuration assumes that you are using the
+       Cygwin environment on Windows.  An option is to use the native
+       CMD.exe window build as described in the top-level README.txt
+       file.  To set up that configuration:
+
+       -CONFIG_WINDOWS_CYGWIN=y
+       +CONFIG_WINDOWS_NATIVE=y
+
+       And after configuring, make sure that CONFIG_APPS_DIR uses
+       the back slash character.  For example:
+
+        CONFIG_APPS_DIR="..\apps"
 
 Check out any README.txt files in these <sub-directory>s.
diff --git a/nuttx/configs/ez80f910200kitg/ostest/Make.defs b/nuttx/configs/ez80f910200kitg/ostest/Make.defs
index 88280d8ec..54e377de7 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/Make.defs
+++ b/nuttx/configs/ez80f910200kitg/ostest/Make.defs
@@ -47,6 +47,20 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   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"}
+
+  # 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:'.'
 else
   WINTOOL := y
   INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
@@ -55,99 +69,139 @@ else
   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
+  # These are the same directories but with the directory separator
+  # character swapped as needed by the ZDS-II compiler
+
+  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
 
-# Escaped versions
+  ETOPDIR := ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
+  EZDSSTDINCDIR := ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
+  EZDSZILOGINCDIR := ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
 
-ETOPDIR 		:= ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
-EZDSSTDINCDIR		:= ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
-EZDSZILOGINCDIR 	:= ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
+  # CFLAGs
+
+  ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+  EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
+  ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+  ARCHUSRINCLUDES = -usrinc:'.'
+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)
-  ARCHASMOPTIMIZATION	= -debug -NOsdiopt
+  ARCHASMOPTIMIZATION = -debug -NOsdiopt
 else
-  ARCHASMOPTIMIZATION	= -nodebug -NOsdiopt
+  ARCHASMOPTIMIZATION = -nodebug -NOsdiopt
 endif
 
-ARCHASMCPUFLAGS 	= -cpu:$(ARCHCPU) -NOigcase
-ARCHASMLIST		= -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
-ARCHASMWARNINGS 	= -warn
-ARCHASMDEFINES		= -define:$(ARCHCPUDEF)=1 -define:$(ARCHFAMILYDEF)=1 -define:__ASSEMBLY__
-ARCHASMINCLUDES 	= -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
-EARCHASMINCLUDES 	= -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
-AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
-			  $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
+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)
 
 # Compiler definitions
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION	= -debug -reduceopt
+  ARCHOPTIMIZATION = -debug -reduceopt
 else
-  ARCHOPTIMIZATION	= -nodebug -optsize
+  ARCHOPTIMIZATION = -nodebug -optsize
 endif
 
-ARCHCPUFLAGS		= -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
-			  -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)"
-ARCHLIST		= -keeplst -NOlist -NOlistinc -keepasm
-ARCHPICFLAGS		=
-ARCHWARNINGS		= -warn
-ARCHDEFINES		= -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF)
-ARCHSTDINCLUDES 	= -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
-ARCHUSRINCLUDES 	= -usrinc:'.'
-ARCHINCLUDES		= $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-
-CPPDEFINES              = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__
-CPPINCLUDES             = -I$(TOPDIR)/include
-CPPFLAGS                = $(CPPDEFINES) $(CPPINCLUDES)
+ARCHCPUFLAGS = -chartype:S -promote -cpu:$(ARCHCPU) -NOgenprintf -NOmodsect \
+			   -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)"
+ARCHLIST = -keeplst -NOlist -NOlistinc -keepasm
+ARCHPICFLAGS =
+ARCHWARNINGS = -warn
+ARCHDEFINES = -define:$(ARCHCPUDEF) -define:$(ARCHFAMILYDEF)
+ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+
+CPPDEFINES = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D__ASSEMBLY__
+CPPINCLUDES = -I$(TOPDIR)$(DELIM)include
+CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES)
 
 # Librarian definitions
 
-ARFLAGS 		= -quiet -warn
+ARFLAGS = -quiet -warn
 
 # Linker definitions
 
-LINKCMDTEMPLATE 	= $(TOPDIR)/configs/ez80f910200kitg/ostest/ostest.linkcmd
+LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)configs$(DELIM)ez80f910200kitg$(DELIM)ostest$(DELIM)ostest.linkcmd
 
 # Tool names/pathes
 
-CROSSDEV		=
-CC			= $(ZDSBINDIR)/ez80cc.exe
-CPP			= gcc -E
-LD			= $(ZDSBINDIR)/ez80link.exe
-AS			= $(ZDSBINDIR)/ez80asm.exe
-AR			= $(ZDSBINDIR)/ez80lib.exe
+CROSSDEV =
+CPP = gcc -E
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  # PATH varialble should be set
+  CC = ez80cc.exe
+  LD = ez80link.exe
+  AS = ez80asm.exe
+  AR = ez80lib.exe
+else
+  # Cygwin PATH variable is not sufficient
+  CC = "$(ZDSBINDIR)$(DELIM)ez80cc.exe"
+  LD = "$(ZDSBINDIR)$(DELIM)ez80link.exe"
+  AS = "$(ZDSBINDIR)$(DELIM)ez80asm.exe"
+  AR = "$(ZDSBINDIR)$(DELIM)ez80lib.exe"
+endif
 
 # File extensions
 
-ASMEXT			= .asm
-OBJEXT			= .obj
-LIBEXT			= .lib
-EXEEXT			= .lod
-HEXEXT			= .hex
+ASMEXT = .asm
+OBJEXT = .obj
+LIBEXT = .lib
+EXEEXT = .lod
+HEXEXT = .hex
 
 # These are the macros that will be used in the NuttX make system
 # to compile and assembly source files and to insert the resulting
 # object files into an archive
 
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+define PREPROCESS
+	@echo CPP: $1->$2
+	$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+	$(Q) "$(CC)" $(CFLAGS) $1
+endef
+
+define ASSEMBLE
+	$(Q) "$(AS)" $(AFLAGS) $1
+endef
+
+define ARCHIVE
+	echo AR: $2
+	$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
+endef
+
+define CLEAN
+	$(Q) if exist *.obj (del /f /q *.obj)
+	$(Q) if exist *.src (del /f /q *.src)
+	$(Q) if exist *.lib (del /f /q *.lib)
+	$(Q) if exist *.hex (del /f /q *.hex)
+	$(Q) if exist *.lod (del /f /q *.lod)
+	$(Q) if exist *.lst (del /f /q *.lst)
+endef
+else
 define PREPROCESS
 	@echo "CPP: $1->$2"
 	$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
@@ -163,36 +217,45 @@ define ASSEMBLE
 	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
 endef
 
-ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-define ARCHIVE
-	echo "AR: $2";
-	$(Q) for %%G in ($(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 ; } \
 	done
 endef
-endif
 
 define CLEAN
 	$(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
 endef
+endif
 
-# This is the tool to use for dependencies (i.e., none)
+# Windows native host tool definitions
 
-MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  HOSTCC = mingw32-gcc.exe
+  HOSTINCLUDES = -I.
+  HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
+  HOSTLDFLAGS =
+  HOSTEXEEXT = .exe
 
-# ZDS-II cannot follow Cygwin soft links, so we will have to use directory copies
+  # Windows-native host tools
 
-DIRLINK 		= $(TOPDIR)/tools/winlink.sh
-DIRUNLINK		= $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)\tools\mkdeps.exe --winnative
+else
 
 # Linux/Cygwin host tool definitions
 
-HOSTCC			= gcc
-HOSTINCLUDES		= -I.
-HOSTCFLAGS		= -Wall -wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		=
+  HOSTCC = gcc
+  HOSTINCLUDES = -I.
+  HOSTCFLAGS = -Wall -wstrict-prototypes -Wshadow -g -pipe
+  HOSTLDFLAGS =
+
+  # This is the tool to use for dependencies (i.e., none)
+
+  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh
+
+  # ZDS-II cannot follow Cygwin soft links, so we will have to use directory copies
+
+  DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)winlink.sh
+  DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
+endif
diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig
index 831e3326d..e061e6289 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig
@@ -111,7 +111,7 @@ CONFIG_HAVE_LOWUARTINIT=y
 #
 # Board Settings
 #
-CONFIG_DRAM_START=
+CONFIG_DRAM_START=0
 CONFIG_DRAM_SIZE=65536
 
 #
diff --git a/nuttx/configs/ez80f910200kitg/ostest/setenv.bat b/nuttx/configs/ez80f910200kitg/ostest/setenv.bat
new file mode 100644
index 000000000..f461cf1cc
--- /dev/null
+++ b/nuttx/configs/ez80f910200kitg/ostest/setenv.bat
@@ -0,0 +1,50 @@
+@echo off

+

+rem configs/ez80f810200kitg/ostest/setenv.bat

+rem

+rem   Copyright (C) 2012 Gregory Nutt. All rights reserved.

+rem   Author: Gregory Nutt <gnutt@nuttx.org>

+rem

+rem Redistribution and use in source and binary forms, with or without

+rem modification, are permitted provided that the following conditions

+rem are met:

+rem

+rem 1. Redistributions of source code must retain the above copyright

+rem    notice, this list of conditions and the following disclaimer.

+rem 2. Redistributions in binary form must reproduce the above copyright

+rem    notice, this list of conditions and the following disclaimer in

+rem    the documentation and/or other materials provided with the

+rem    distribution.

+rem 3. Neither the name NuttX nor the names of its contributors may be

+rem    used to endorse or promote products derived from this software

+rem    without specific prior written permission.

+rem

+rem THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+rem "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+rem LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

+rem FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

+rem COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,

+rem INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

+rem BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS

+rem OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED

+rem AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+rem LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN

+rem ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+rem POSSIBILITY OF SUCH DAMAGE.

+

+rem This is the location where I installed in the MinGW compiler. With

+rem this configuration, it is recommended that you do NOT install the

+rem MSYS tools; they conflict with the GNUWin32 tools.  See

+rem http://www.mingw.org/ for further info.

+

+set PATH=C:\MinGW\bin;%PATH%

+

+rem This is the location where I installed the ZDS-II toolchain.

+

+set PATH=C:\Program Files (x86)\ZiLOG\ZDSII_eZ80Acclaim!_5.1.1\bin;%PATH%

+

+rem This is the location where I installed the GNUWin32 tools.  See

+rem http://gnuwin32.sourceforge.net/.

+

+set PATH=C:\gnuwin32\bin;%PATH%

+echo %PATH%

diff --git a/nuttx/configs/ez80f910200kitg/ostest/setenv.sh b/nuttx/configs/ez80f910200kitg/ostest/setenv.sh
index e692029ae..ce3ea8b53 100755
--- a/nuttx/configs/ez80f910200kitg/ostest/setenv.sh
+++ b/nuttx/configs/ez80f910200kitg/ostest/setenv.sh
@@ -33,20 +33,28 @@
 #
 # Check how we were executed
 #
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
+WD=`pwd`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+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.
+# This is the Cygwin path to location where the XDS-II tools were installed
 #
-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"
+TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_eZ80Acclaim!_5.1.1\bin"
 
+#
+# Add the path to the toolchain to the PATH varialble
+#
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"
diff --git a/nuttx/configs/ez80f910200kitg/src/Makefile b/nuttx/configs/ez80f910200kitg/src/Makefile
index 940e331cf..12c39824e 100644
--- a/nuttx/configs/ez80f910200kitg/src/Makefile
+++ b/nuttx/configs/ez80f910200kitg/src/Makefile
@@ -35,20 +35,27 @@
 
 -include $(TOPDIR)/Make.defs
 
-ARCHSRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-WARCHSRCDIR	= ${shell cygpath -w $(ARCHSRCDIR)}
-USRINCLUDES	= -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
-INCLUDES	= $(ARCHSTDINCLUDES) $(USRINCLUDES)
-CFLAGS		= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched
+ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
 
-ASRCS		= 
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-CSRCS		= ez80_lowinit.c ez80_leds.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  USRINCLUDES = -usrinc:'.;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common'
+else
+  WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
+  WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
+  USRINCLUDES = -usrinc:'.;$(WSCHEDSRCDIR);$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
+endif
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 
+ASRCS = 
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+CSRCS = ez80_lowinit.c ez80_leds.c
+COBJS = $(CSRCS:.c=$(OBJEXT))
+
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
 all: libboard$(LIBEXT)