zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

px4: fixed passing of EXTRAFLAGS for ArduCopter frame type

master
Andrew Tridgell 12 years ago
parent
636573f0fd
commit
0af84177da
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      mk/px4_core.mk
  2. 2
      mk/px4_targets.mk

2
mk/px4_core.mk
Unescape View File

@ -167,7 +167,7 @@ PARENT_MAKEFILE := $(lastword $(filter-out $(THIS_MAKEFILE),$(MAKEFILE_LIST)))
include $(APPDIR)/Make.defs include $(APPDIR)/Make.defs
# this allows us to generate the main function # 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) CFLAGS += $(SKETCHFLAGS)
CXXFLAGS += $(SKETCHFLAGS) CXXFLAGS += $(SKETCHFLAGS)

2
mk/px4_targets.mk
Unescape View File

@ -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 # 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_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: px4:

Write Preview
Loading…
Cancel
Save