diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-16 12:41:58 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-16 12:41:58 +0000 |
commit | 5005a9f2ff8fa5549de72c10067753da303f210e (patch) | |
tree | c71a30be978332c2b24582697e98963c8d442794 /nuttx | |
parent | 51e0c930ca583196bf1075217cff969a0f7e4619 (diff) | |
download | px4-nuttx-5005a9f2ff8fa5549de72c10067753da303f210e.tar.gz px4-nuttx-5005a9f2ff8fa5549de72c10067753da303f210e.tar.bz2 px4-nuttx-5005a9f2ff8fa5549de72c10067753da303f210e.zip |
Changes from Mike
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5361 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/ChangeLog | 4 | ||||
-rw-r--r-- | nuttx/tools/Config.mk | 13 | ||||
-rw-r--r-- | nuttx/tools/Makefile.host | 6 |
3 files changed, 20 insertions, 3 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 9c62db68f..72fab8a71 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3632,5 +3632,7 @@ by Konstantin Dimitrov. * Fixed an uninitialized variable in the file system that can cause assertions if DEBUG on (contributed by Lorenz Meier). - + * Config.mk: Defined DELIM to be either / or \, depending upon + CONFIG_WINDOWS_NATIVE. This will allow me to eliminate a lot of + conditional logic elsewhere. diff --git a/nuttx/tools/Config.mk b/nuttx/tools/Config.mk index f05933f1a..4cdda113c 100644 --- a/nuttx/tools/Config.mk +++ b/nuttx/tools/Config.mk @@ -43,6 +43,19 @@ CONFIG_ARCH := $(patsubst "%",%,$(strip $(CONFIG_ARCH))) CONFIG_ARCH_CHIP := $(patsubst "%",%,$(strip $(CONFIG_ARCH_CHIP))) CONFIG_ARCH_BOARD := $(patsubst "%",%,$(strip $(CONFIG_ARCH_BOARD))) +# DELIM - Path segment delimiter character +# +# Depends on this settings defined in board-specific defconfig file installed +# at $(TOPDIR)/.config: +# +# CONFIG_WINDOWS_NATIVE - Defined for a Windows native build + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + DELIM = $(strip \) +else + DELIM = $(strip /) +endif + # INCDIR - Convert a list of directory paths to a list of compiler include # directirves # Example: CFFLAGS += ${shell $(INCDIR) [options] "compiler" "dir1" "dir2" "dir2" ...} diff --git a/nuttx/tools/Makefile.host b/nuttx/tools/Makefile.host index 478625008..16975a42a 100644 --- a/nuttx/tools/Makefile.host +++ b/nuttx/tools/Makefile.host @@ -123,5 +123,7 @@ endif clean: $(Q) rm -f *.o *.a *~ .*.swp - $(Q) rm -f mkconfig mksyscall mkversion bdf-converter - $(Q) rm -f mkconfig.exe mksyscall.exe mkversion.exe bdf-converter.exe + $(Q) rm -f mkdeps mkconfig mksyscall mkversion bdf-converter + $(Q) rm -f mkdeps.exe mkconfig.exe mksyscall.exe mkversion.exe bdf-converter.exe + $(Q) rm -rf *.dSYM + |