mirror of https://github.com/ArduPilot/ardupilot
Added config.mk file inclusion for global configurations settings on make based builds. See ArduPilotOne for scripts/configure to see an example. config.mk should be located in the temporary directory where the rest of the build results are placed.
git-svn-id: https://arducopter.googlecode.com/svn/trunk@2655 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
parent
8ab94794cd
commit
f2457c94d9
|
@ -27,16 +27,6 @@
|
|||
# Build an Arduino sketch.
|
||||
#
|
||||
|
||||
################################################################################
|
||||
# Config options
|
||||
#
|
||||
# The Makefile calling us must specify BOARD
|
||||
#
|
||||
HARDWARE ?= arduino
|
||||
ifeq ($(BOARD),)
|
||||
$(error ERROR: must set BOARD before including this file)
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
# Paths
|
||||
#
|
||||
|
@ -82,6 +72,18 @@ SKETCH := $(lastword $(subst /, ,$(SRCROOT)))
|
|||
TMPDIR ?= /tmp
|
||||
BUILDROOT := $(abspath $(TMPDIR)/$(SKETCH).build)
|
||||
|
||||
|
||||
################################################################################
|
||||
# Config options
|
||||
#
|
||||
# The Makefile calling us must specify BOARD
|
||||
#
|
||||
include $(TMPDIR)/config.mk
|
||||
HARDWARE ?= arduino
|
||||
ifeq ($(BOARD),)
|
||||
$(error ERROR: must set BOARD before including this file)
|
||||
endif
|
||||
|
||||
#
|
||||
# Find Arduino, if not explicitly specified
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue