More changes to restore the native Windows build
This commit is contained in:
parent
707d473a3e
commit
e10ab85d1d
@ -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).
|
||||
|
||||
|
@ -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
|
||||
|
@ -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))
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user