diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-02-07 10:14:11 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-02-07 10:14:11 -0600 |
| commit | bcde5f18638e9f9bea835f63736514791643e257 (patch) | |
| tree | 5242db930db4b9cfa577cef7430bde04162e6644 | |
| parent | 80c8215e5554d1fd7682adf131466c45111b8945 (diff) | |
| download | nuttx-bcde5f18638e9f9bea835f63736514791643e257.tar.gz nuttx-bcde5f18638e9f9bea835f63736514791643e257.tar.bz2 nuttx-bcde5f18638e9f9bea835f63736514791643e257.zip | |
More changes to restore the native Windows build
| -rw-r--r-- | apps/ChangeLog.txt | 2 | ||||
| -rw-r--r-- | nuttx/ChangeLog | 1 | ||||
| -rw-r--r-- | nuttx/configs/olimex-stm32-p107/nsh/Make.defs | 1 | ||||
| -rw-r--r-- | nuttx/libc/Makefile | 4 | ||||
| -rw-r--r-- | nuttx/mm/Makefile | 5 |
5 files changed, 10 insertions, 3 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 7a1caf2a6..8e5cb03a8 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -817,3 +817,5 @@ * apps/nshlib: Use of the standard tiney readline (about .25KB) is now an option and can be replaces with the EMACX-like CLE (about 2KB) (2014-02-02). + * Several changes to restore Windows native build (2014-2-7) + diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 04dd63a12..ab57cb70f 100644 --- a/nuttx/ChangeLog +++ b/nuttx/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/nuttx/configs/olimex-stm32-p107/nsh/Make.defs b/nuttx/configs/olimex-stm32-p107/nsh/Make.defs index e5c95641e..bcd79c4de 100644 --- a/nuttx/configs/olimex-stm32-p107/nsh/Make.defs +++ b/nuttx/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/nuttx/libc/Makefile b/nuttx/libc/Makefile index 94884bd80..4556b66a4 100644 --- a/nuttx/libc/Makefile +++ b/nuttx/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/nuttx/mm/Makefile b/nuttx/mm/Makefile index ccc1bfc43..67b824f22 100644 --- a/nuttx/mm/Makefile +++ b/nuttx/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) |