From e10ab85d1d39950d719a4bd7d2379c01d8c59a28 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 7 Feb 2014 10:14:11 -0600
Subject: [PATCH] More changes to restore the native Windows build

---
 ChangeLog                               | 1 +
 configs/olimex-stm32-p107/nsh/Make.defs | 1 -
 libc/Makefile                           | 4 +++-
 mm/Makefile                             | 5 ++++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 04dd63a12b..ab57cb70ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6544,4 +6544,5 @@
 	  that the LM4f120 Launchpad had (2013-02-03).
 	* Documentation/NuttXCCodingStandard.html:  Add a coding standards
 	  document.  Very boring stuff (2014-2-6).
+	* Several changes to restore the native Windows build (2014-2-7).
 
diff --git a/configs/olimex-stm32-p107/nsh/Make.defs b/configs/olimex-stm32-p107/nsh/Make.defs
index e5c95641e8..bcd79c4dec 100644
--- a/configs/olimex-stm32-p107/nsh/Make.defs
+++ b/configs/olimex-stm32-p107/nsh/Make.defs
@@ -51,7 +51,6 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
   ARCHINCLUDES = -I. -isystem $(TOPDIR)\include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)\include -isystem $(TOPDIR)\include\cxx
   ARCHSCRIPT = -T$(TOPDIR)\configs\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT)
-  DELIM := $(strip /)
 else
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
diff --git a/libc/Makefile b/libc/Makefile
index 94884bd80a..4556b66a49 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # libc/Makefile
 #
-#   Copyright (C) 2007-2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,8 @@ include wqueue/Make.defs
 include misc/Make.defs
 include audio/Make.defs
 
+# REVISIT: Backslash causes problems in $(COBJS) target
+DELIM := $(strip /)
 BINDIR ?= bin
 
 AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)%$(OBJEXT), $(ASRCS))
diff --git a/mm/Makefile b/mm/Makefile
index ccc1bfc43c..67b824f222 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # mm/Makefile
 #
-#   Copyright (C) 2007, 2012, 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2012, 2013-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,9 @@
 
 -include $(TOPDIR)/Make.defs
 
+# REVISIT: Backslash causes problems in $(COBJS) target
+DELIM := $(strip /)
+
 # CFLAGS
 
 ifeq ($(CONFIG_NUTTX_KERNEL),y)