From 0af84177dacdc7c6fc13946e89928e4d7e5afdf4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Apr 2013 13:19:45 +1000 Subject: [PATCH] px4: fixed passing of EXTRAFLAGS for ArduCopter frame type --- mk/px4_core.mk | 2 +- mk/px4_targets.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/px4_core.mk b/mk/px4_core.mk index 1aef04a17b..da09efbf27 100644 --- a/mk/px4_core.mk +++ b/mk/px4_core.mk @@ -167,7 +167,7 @@ PARENT_MAKEFILE := $(lastword $(filter-out $(THIS_MAKEFILE),$(MAKEFILE_LIST))) include $(APPDIR)/Make.defs # this allows us to generate the main function -SKETCHFLAGS = -DCONFIG_HAL_BOARD=HAL_BOARD_PX4 -DSKETCHNAME=\"$(SKETCH)\" -DSKETCH_MAIN=$(SKETCH)_main +SKETCHFLAGS = -DCONFIG_HAL_BOARD=HAL_BOARD_PX4 -DSKETCHNAME=\"$(SKETCH)\" -DSKETCH_MAIN=$(SKETCH)_main $(EXTRAFLAGS) CFLAGS += $(SKETCHFLAGS) CXXFLAGS += $(SKETCHFLAGS) diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk index 6048cd7f92..7d9a7e284e 100644 --- a/mk/px4_targets.mk +++ b/mk/px4_targets.mk @@ -8,7 +8,7 @@ PX4_EXTERNAL_SCRIPTS = $(HAL_PX4_DIR)/scripts/rc.APM~init.d/rc.APM # we use CURDIR instead of PWD to avoid a problem with MINGW32 on Windows PX4_EXTERNAL = EXTERNAL_APPS=$(CURDIR) EXTERNAL_SCRIPTS=$(PX4_EXTERNAL_SCRIPTS) -PX4_MAKE = make -C $(PX4_ROOT) $(PX4_EXTERNAL) CONFIG_APM=y +PX4_MAKE = make -C $(PX4_ROOT) $(PX4_EXTERNAL) CONFIG_APM=y EXTRAFLAGS=$(EXTRAFLAGS) px4: