From 2cabb1130751d79a59d08ea4d731ba980f118eb8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 28 Nov 2011 15:59:27 +1100 Subject: [PATCH] mavlink: don't force CLI and HIL with mavlink10 build --- ArduCopter/Makefile | 2 +- ArduPlane/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ArduCopter/Makefile b/ArduCopter/Makefile index 712e288804..ff51071f54 100644 --- a/ArduCopter/Makefile +++ b/ArduCopter/Makefile @@ -22,7 +22,7 @@ apm2: make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2 -DCLI_SLIDER_ENABLED=DISABLED" mavlink10: - make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DMAVLINK10 -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED" + make -f Makefile EXTRAFLAGS="-DMAVLINK10" etags: cd .. && etags -f ArduCopter/TAGS --langmap=C++:.pde.cpp.h $$(git ls-files ArduCopter libraries) diff --git a/ArduPlane/Makefile b/ArduPlane/Makefile index 77407d4d0a..bd70435fd6 100644 --- a/ArduPlane/Makefile +++ b/ArduPlane/Makefile @@ -22,7 +22,7 @@ apm2: make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_APM2" mavlink10: - make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DMAVLINK10 -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED" + make -f Makefile EXTRAFLAGS="-DMAVLINK10" etags: cd .. && etags -f ArduPlane/TAGS --langmap=C++:.pde.cpp.h $$(git ls-files ArduPlane libraries)