Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-07 17:35:22 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Changes from Mike

Browse Source 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5361 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-11-16 12:41:58 +00:00
parent e24f408972
commit da3dd04ea5
15 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ChangeLog.txt
+3
View File
@@ -419,3 +419,6 @@
by Freddie Chopin.
* Makefile, */Makefile: Various fixes for Windows native build. Now uses
make foreach loops instead of shell loops.
* apps/examples/elf/test/*/Makefile: OSX doesn't support install -D, use
mkdir -p then install without the -D. From Mike Smith.
apps/Makefile
+3 -8
View File
@@ -102,15 +102,9 @@ endif
# Create the list of available applications (INSTALLED_APPS)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ADD_BUILTIN
INSTALLED_APPS += $(if $(wildcard $1\Makefile),$1,)
INSTALLED_APPS += $(if $(wildcard $1$(DELIM)Makefile),$1,)
endef
else
define ADD_BUILTIN
INSTALLED_APPS += $(if $(wildcard $1/Makefile),$1,)
endef
endif
$(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN))))
@@ -119,7 +113,8 @@ $(foreach BUILTIN, $(CONFIGURED_APPS), $(eval $(call ADD_BUILTIN,$(BUILTIN))))
# provided by the user (possibly as a symbolic link) to add libraries and
# applications to the standard build from the repository.
EXTERNAL_DIR := $(dir $(wildcard external/Makefile))
EXTERNAL_DIR := $(dir $(wildcard external$(DELIM)Makefile))
INSTALLED_APPS += $(EXTERNAL_DIR)
SUBDIRS += $(EXTERNAL_DIR)
apps/examples/elf/tests/errno/Makefile
+2 -1
View File
@@ -55,5 +55,6 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core
install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
@mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)
apps/examples/elf/tests/hello/Makefile
+2 -1
View File
@@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core
install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
@mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)
apps/examples/elf/tests/helloxx/Makefile
+5 -4
View File
@@ -109,12 +109,13 @@ clean:
@rm -f $(ALL_BIN) *.o *~ .*.swp core
install: $(ALL_BIN)
@install -D $(BIN1) $(ROMFS_DIR)/$(BIN1)
@install -D $(BIN2) $(ROMFS_DIR)/$(BIN2)
@mkdir -p $(ROMFS_DIR)
@install $(BIN1) $(ROMFS_DIR)/$(BIN1)
@install $(BIN2) $(ROMFS_DIR)/$(BIN2)
ifeq ($(CONFIG_BINFMT_CONSTRUCTORS),y)
@install -D $(BIN3) $(ROMFS_DIR)/$(BIN3)
@install $(BIN3) $(ROMFS_DIR)/$(BIN3)
endif
# @install -D $(BIN4) $(ROMFS_DIR)/$(BIN4)
# @install $(BIN4) $(ROMFS_DIR)/$(BIN4)
apps/examples/elf/tests/longjmp/Makefile
+2 -1
View File
@@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core
install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
@mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)
apps/examples/elf/tests/mutex/Makefile
+2 -1
View File
@@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core
install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
@mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)
apps/examples/elf/tests/pthread/Makefile
+2 -1
View File
@@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core
install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
@mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)
apps/examples/elf/tests/signal/Makefile
+2 -1
View File
@@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core
install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
@mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)
apps/examples/elf/tests/struct/Makefile
+2 -1
View File
@@ -56,4 +56,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core
install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
@mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)
apps/examples/elf/tests/task/Makefile
+2 -1
View File
@@ -55,4 +55,5 @@ clean:
@rm -f $(BIN) *.o *~ .*.swp core
install:
@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
@mkdir -p $(ROMFS_DIR)
@install $(BIN) $(ROMFS_DIR)/$(BIN)
misc/tools/README.txt
+8 -2
View File
@@ -50,11 +50,17 @@ kconfig-frontends-3.3.0-1-libintl.patch
http://ymorin.is-a-geek.org/download/kconfig-frontends/
kconfig-macos.path
------------------
kconfig-macos.patch
-------------------
This is a patch to make the kconfig-frontends-3.3.0 build on Mac OS X.
To build the conf and mconf frontends, use the following commands:
./configure --disable-shared --enable-static --disable-gconf --disable-qconf --disable-nconf --disable-utils
make
make install
kconfig-frontends for Windows
=============================
nuttx/ChangeLog
+3 -1
View File
@@ -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.
nuttx/tools/Config.mk
+13
View File
@@ -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" ...}
nuttx/tools/Makefile.host
+4 -2
View File
@@ -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