aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: added support for developer.mk (at request of David)

Browse Source
This commit is contained in:
Andrew Tridgell 2015-06-19 17:57:13 +10:00
parent c4c97b14d3
commit cfa63254b6
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mk/environ.mk
View File

@ -58,6 +58,11 @@ $(info Reading $(SKETCHBOOK)/config.mk)
include $(SKETCHBOOK)/config.mk include $(SKETCHBOOK)/config.mk
endif endif
ifneq ($(wildcard $(SKETCHBOOK)/developer.mk),)
$(info Reading $(SKETCHBOOK)/developer.mk)
include $(SKETCHBOOK)/developer.mk
endif
# #
# Work out the sketch name from the name of the source directory. # Work out the sketch name from the name of the source directory.
# #

10
mk/px4_targets.mk
View File

@ -12,11 +12,15 @@ ifneq ($(UAVCAN_DIR),)
$(error UAVCAN_DIR found in config.mk - Please see http://dev.ardupilot.com/wiki/git-submodules/) $(error UAVCAN_DIR found in config.mk - Please see http://dev.ardupilot.com/wiki/git-submodules/)
endif endif
# these can be overridden in developer.mk
PX4FIRMWARE_DIRECTORY ?= $(SKETCHBOOK)/modules/PX4Firmware
PX4NUTTX_DIRECTORY ?= $(SKETCHBOOK)/modules/PX4Firmware
UAVCAN_DIRECTORY ?= $(SKETCHBOOK)/modules/uavcan
PX4_ROOT := $(shell cd $(SKETCHBOOK)/modules/PX4Firmware && pwd) PX4_ROOT := $(shell cd $(PX4FIRMWARE_DIRECTORY) && pwd)
NUTTX_ROOT := $(shell cd $(SKETCHBOOK)/modules/PX4NuttX && pwd) NUTTX_ROOT := $(shell cd $(PX4NUTTX_DIRECTORY) && pwd)
NUTTX_SRC := $(NUTTX_ROOT)/nuttx/ NUTTX_SRC := $(NUTTX_ROOT)/nuttx/
UAVCAN_DIR=$(shell cd $(SKETCHBOOK)/modules/uavcan && pwd)/ UAVCAN_DIR=$(shell cd $(UAVCAN_DIRECTORY) && pwd)/
# warn if user has old PX4Firmware or PX4NuttX trees # warn if user has old PX4Firmware or PX4NuttX trees
ifneq ($(wildcard $(SKETCHBOOK)/../PX4Firmware),) ifneq ($(wildcard $(SKETCHBOOK)/../PX4Firmware),)