Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

mk: default to building with MAVLink2 support

Browse Source
This commit is contained in:
Andrew Tridgell 2016-04-05 14:10:04 +10:00
parent 12c1d58511
commit d477ecc24e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mk/environ.mk
View File

@ -120,14 +120,14 @@ ifneq ($(findstring CYGWIN, $(SYSTYPE)),)
endif endif
endif endif
ifneq ($(findstring mavlink2, $(MAKECMDGOALS)),) ifneq ($(findstring mavlink1, $(MAKECMDGOALS)),)
EXTRAFLAGS += -DMAVLINK_PROTOCOL_VERSION=2
MAVLINK_SUBDIR=v2.0
MAVLINK_WIRE_PROTOCOL=2.0
else
EXTRAFLAGS += -DMAVLINK_PROTOCOL_VERSION=1 EXTRAFLAGS += -DMAVLINK_PROTOCOL_VERSION=1
MAVLINK_SUBDIR=v1.0 MAVLINK_SUBDIR=v1.0
MAVLINK_WIRE_PROTOCOL=1.0 MAVLINK_WIRE_PROTOCOL=1.0
else
EXTRAFLAGS += -DMAVLINK_PROTOCOL_VERSION=2
MAVLINK_SUBDIR=v2.0
MAVLINK_WIRE_PROTOCOL=2.0
endif endif
ifneq ($(APPDIR),) ifneq ($(APPDIR),)

8
mk/targets.mk
View File

@ -123,8 +123,8 @@ $(1)-$(2) : EXTRAFLAGS += "-DFRAME_CONFIG=$(shell echo $(2) | tr a-z A-Z | sed s
$(1)-$(2) : $(1) $(1)-$(2) : $(1)
$(1)-$(2)-hil : $(1)-$(2) $(1)-$(2)-hil : $(1)-$(2)
$(1)-$(2)-debug : $(1)-$(2) $(1)-$(2)-debug : $(1)-$(2)
$(1)-$(2)-mavlink2 : $(1)-$(2) $(1)-$(2)-mavlink1 : $(1)-$(2)
$(1)-$(2)-debug-mavlink2 : $(1)-$(2) $(1)-$(2)-debug-mavlink1 : $(1)-$(2)
$(1)-$(2)-hilsensors : $(1)-$(2) $(1)-$(2)-hilsensors : $(1)-$(2)
$(1)-$(2)-upload : $(1)-$(2) $(1)-$(2)-upload : $(1)-$(2)
$(1)-$(2)-upload : $(1)-upload $(1)-$(2)-upload : $(1)-upload
@ -133,8 +133,8 @@ endef
define board_template define board_template
$(1)-hil : $(1) $(1)-hil : $(1)
$(1)-debug : $(1) $(1)-debug : $(1)
$(1)-mavlink2 : $(1) $(1)-mavlink1 : $(1)
$(1)-debug-mavlink2 : $(1)-debug $(1)-debug-mavlink1 : $(1)-debug
$(1)-asan : $(1) $(1)-asan : $(1)
$(1)-hilsensors : $(1) $(1)-hilsensors : $(1)
endef endef