fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 17:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

APP -> MODULE

Browse Source 
remove as many duplicate slashes, etc. as seems practical
This commit is contained in:
px4dev
2013-02-23 22:01:00 -08:00
parent 8d7621079a
commit d24599931a
11 changed files with 303 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/nuttx.mk
+12 -8
View File
@@ -6,7 +6,7 @@
#
# Check that the NuttX archive for the selected board is available.
#
NUTTX_ARCHIVE := $(wildcard $(ARCHIVE_DIR)/$(BOARD).export)
NUTTX_ARCHIVE := $(wildcard $(ARCHIVE_DIR)$(BOARD).export)
ifeq ($(NUTTX_ARCHIVE),)
$(error The NuttX export archive for $(BOARD) is missing from $(ARCHIVE_DIR) - try 'make archives' in $(PX4_BASE))
endif
@@ -16,23 +16,27 @@ endif
# if it changes, everything should be rebuilt. So, use it as the trigger to
# unpack the NuttX archive.
#
NUTTX_EXPORT_DIR = $(WORK_DIR)/nuttx-export
NUTTX_CONFIG_HEADER = $(NUTTX_EXPORT_DIR)/include/nuttx/config.h
NUTTX_EXPORT_DIR = $(WORK_DIR)nuttx-export/
NUTTX_CONFIG_HEADER = $(NUTTX_EXPORT_DIR)include/nuttx/config.h
$(info NUTTX_EXPORT_DIR $(NUTTX_EXPORT_DIR))
$(info NUTTX_CONFIG_HEADER $(NUTTX_CONFIG_HEADER))
GLOBAL_DEPS += $(NUTTX_CONFIG_HEADER)
#
# Use the linker script from the NuttX export
#
LDSCRIPT = $(NUTTX_EXPORT_DIR)/build/ld.script
LDSCRIPT = $(NUTTX_EXPORT_DIR)build/ld.script
#
# Add directories from the NuttX export to the relevant search paths
#
INCLUDE_DIRS += $(NUTTX_EXPORT_DIR)/include
LIB_DIRS += $(NUTTX_EXPORT_DIR)/libs
INCLUDE_DIRS += $(NUTTX_EXPORT_DIR)include
LIB_DIRS += $(NUTTX_EXPORT_DIR)libs
LIBS += -lapps -lnuttx
LINK_DEPS += $(NUTTX_EXPORT_DIR)/libs/libapps.a \
$(NUTTX_EXPORT_DIR)/libs/libnuttx.a
LINK_DEPS += $(NUTTX_EXPORT_DIR)libs/libapps.a \
$(NUTTX_EXPORT_DIR)libs/libnuttx.a
$(NUTTX_CONFIG_HEADER): $(NUTTX_ARCHIVE)
@echo %% Unpacking $(NUTTX_ARCHIVE)