summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-14 17:04:03 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-14 17:04:03 +0000
commit99f17aadf65f632a7b2a21c2d04edb7eafed28ec (patch)
treebe86ad4cffc9b749f8373f8f0ba27d7a070aa46f /nuttx
parentdc6231eef588c2720267978310154de5ee1c4bf2 (diff)
downloadpx4-nuttx-99f17aadf65f632a7b2a21c2d04edb7eafed28ec.tar.gz
px4-nuttx-99f17aadf65f632a7b2a21c2d04edb7eafed28ec.tar.bz2
px4-nuttx-99f17aadf65f632a7b2a21c2d04edb7eafed28ec.zip
Kconfig updates from Freddie Chopin
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5353 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/Kconfig3
-rw-r--r--nuttx/arch/arm/src/Makefile1
-rw-r--r--nuttx/arch/avr/src/Makefile1
3 files changed, 2 insertions, 3 deletions
diff --git a/nuttx/Kconfig b/nuttx/Kconfig
index 239a791fa..129a50367 100644
--- a/nuttx/Kconfig
+++ b/nuttx/Kconfig
@@ -87,7 +87,8 @@ menu "Build Configuration"
config APPS_DIR
string "Application directory"
- default "../apps"
+ default "../apps" if !WINDOWS_NATIVE
+ default "..\apps" if WINDOWS_NATIVE
---help---
Identifies the directory that builds the
application to link with NuttX. Default: ../apps This symbol must be assigned
diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile
index 17e30411e..be6b10af6 100644
--- a/nuttx/arch/arm/src/Makefile
+++ b/nuttx/arch/arm/src/Makefile
@@ -33,7 +33,6 @@
#
############################################################################
--include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs
-include chip/Make.defs
diff --git a/nuttx/arch/avr/src/Makefile b/nuttx/arch/avr/src/Makefile
index 1d4fed381..9b44c3697 100644
--- a/nuttx/arch/avr/src/Makefile
+++ b/nuttx/arch/avr/src/Makefile
@@ -33,7 +33,6 @@
#
############################################################################
--include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs
-include chip/Make.defs