5 files changed, 119 insertions, 3 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 31700214f..ce2db55b5 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3616,3 +3616,10 @@
 	* tools/Config.mk:  Centralize the definition of the scrpt that will be
 	  used to generated header file include paths for the compiler.  This
 	  needs to be centralized in order to support the Windows native build.
+	* tools/incdir.bat:  A replaced for tools/incdir.sh for use with the
+	  the Windows native build.
+	* Makefile.unix:  The existing top-level Makefile has been renamed
+	  Makefile.unix.
+	* Makefile:  This is a new top-level Makefile that just includes
+	  either Makefile.unix or Makefile.win
+
diff --git a/nuttx/Makefile b/nuttx/Makefile.unix
index adf0d1017..ba0005771 100644
--- a/nuttx/Makefile
+++ b/nuttx/Makefile.unix
@@ -1,5 +1,5 @@
 ############################################################################
-# Makefile
+# Makefile.unix
 #
 #   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/tools/README.txt b/nuttx/tools/README.txt
index 38efc7a3f..dd971fadc 100644
--- a/nuttx/tools/README.txt
+++ b/nuttx/tools/README.txt
@@ -352,13 +352,18 @@ define.sh
   without concern for the particular compiler in use.
 
 incdir.sh
+incdir.bat
 ---------
 
   Different compilers have different conventions for specifying lists
-  of include file paths on the the compiler command line.  This bash
-  script allows the build system to create include file paths without
+  of include file paths on the the compiler command line.  This incdir.sh
+  bash script allows the build system to create include file paths without
   concern for the particular compiler in use.
 
+  The incdir.bat script is a counterpart for use in the native Windows
+  build.  However, their is currently only one compiler supported in
+  that context:  MinGW-GCC.
+
 link.sh
 winlink.sh
 unlink.sh
diff --git a/nuttx/tools/incdir.bat b/nuttx/tools/incdir.bat
new file mode 100755
index 000000000..a53afdd47
--- /dev/null
+++ b/nuttx/tools/incdir.bat
@@ -0,0 +1,102 @@
+@echo off
+
+rem tools/incdir.sh
+rem
+rem   Copyright (C) 2008-2009, 2011 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
+
+rem Handle command line options
+
+set progname=%0
+
+:ArgLoop
+
+rem [-d] [-w] [-h]. [-w] and [-d] Ignored for compatibility with incdir.sh
+
+if "%1"=="-d" goto :NextArg
+if "%1"=="-w" goto :NextArg
+if "%1"=="-h" goto :Usage
+goto :CheckCompiler
+
+:NextArg
+shift
+goto :ArgLoop
+
+:CheckCompiler
+if "%1"=="" (
+  echo ERROR: Missing compiler name
+  goto :Usage
+)
+shift
+
+rem Generate the compiler include path directives.  Easy since only MinGW is
+rem supported
+
+if "%1"=="" (
+  echo ERROR: Missing directory paths
+  goto :Usage
+)
+
+set response=
+
+:DirLoop
+if "%1" == "" (
+  echo %response%
+  goto :End
+)
+
+if not exist %1 (
+  echo ERROR: Path %1 does not exist
+  goto :Usage
+)
+
+if "%response"=="" (
+  set response=-I "%1"
+) else (
+  set response=%response% -I "%1"
+)
+shift
+goto :DirLoop
+
+:Usage
+echo %progname% is a tool for flexible generation of include path arguments for a
+echo variety of different compilers in a variety of compilation environments
+echo USAGE: %progname% [-w] [-d] [-h] ^<compiler-path^> ^<dir1^> [^<dir2^> [^<dir3^> ...]]
+echo Where:
+echo   ^<compiler-path^>
+echo       The full path to your compiler
+echo   ^<dir1^> [^<dir2^> [^<dir3^> ...]]
+echo       A list of include directories
+echo   -w, -d
+echo       For compatibility with incdir.sh (ignored)
+echo   -h
+echo       Shows this help text and exits.
+:End
diff --git a/nuttx/tools/incdir.sh b/nuttx/tools/incdir.sh
index be6a1d07a..181fb1fa2 100755
--- a/nuttx/tools/incdir.sh
+++ b/nuttx/tools/incdir.sh
@@ -63,6 +63,8 @@ while [ ! -z "$1" ]; do
 		echo "		style pathnames like C:\\Program Files"
 		echo "	-d"
 		echo "		Enable script debug"
+		echo "	-h"
+		echo "		Shows this help text and exits."
 		;;
 	* )
 		break;