sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More changes to restore the native Windows build

Browse Source
This commit is contained in:
Gregory Nutt 2014-02-07 10:14:11 -06:00
parent 707d473a3e
commit e10ab85d1d
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6544,4 +6544,5 @@
that the LM4f120 Launchpad had (2013-02-03). that the LM4f120 Launchpad had (2013-02-03).
* Documentation/NuttXCCodingStandard.html: Add a coding standards * Documentation/NuttXCCodingStandard.html: Add a coding standards
document. Very boring stuff (2014-2-6). document. Very boring stuff (2014-2-6).
* Several changes to restore the native Windows build (2014-2-7).

1
configs/olimex-stm32-p107/nsh/Make.defs
View File

@ -51,7 +51,6 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
ARCHINCLUDES = -I. -isystem $(TOPDIR)\include ARCHINCLUDES = -I. -isystem $(TOPDIR)\include
ARCHXXINCLUDES = -I. -isystem $(TOPDIR)\include -isystem $(TOPDIR)\include\cxx ARCHXXINCLUDES = -I. -isystem $(TOPDIR)\include -isystem $(TOPDIR)\include\cxx
ARCHSCRIPT = -T$(TOPDIR)\configs\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) ARCHSCRIPT = -T$(TOPDIR)\configs\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT)
DELIM := $(strip /)
else else
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
# Windows-native toolchains # Windows-native toolchains

4
libc/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# libc/Makefile # 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> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -75,6 +75,8 @@ include wqueue/Make.defs
include misc/Make.defs include misc/Make.defs
include audio/Make.defs include audio/Make.defs
# REVISIT: Backslash causes problems in $(COBJS) target
DELIM := $(strip /)
BINDIR ?= bin BINDIR ?= bin
AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)%$(OBJEXT), $(ASRCS)) AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)%$(OBJEXT), $(ASRCS))

5
mm/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# mm/Makefile # 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> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -35,6 +35,9 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
# REVISIT: Backslash causes problems in $(COBJS) target
DELIM := $(strip /)
# CFLAGS # CFLAGS
ifeq ($(CONFIG_NUTTX_KERNEL),y) ifeq ($(CONFIG_NUTTX_KERNEL),y)