From 4f05bdeb5c54727fe0eb46afd2f673ea59793d91 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Thu, 28 Feb 2019 15:24:53 -0500 Subject: [PATCH] Invert logic and fix bad copy/paste --- QGCExternalLibs.pri | 2 ++ qgroundcontrol.pro | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index f1c8a2645..2aafbf5d5 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -54,6 +54,8 @@ contains (CONFIG, QGC_DISABLE_APM_MAVLINK) { message("Disable APM MAVLink support") DEFINES += NO_ARDUPILOT_DIALECT CONFIG += ArdupilotDisabled +} else { + CONFIG += ArdupilotEnabled } # First we select the dialect, checking for valid user selection diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index c7cbd88b6..96ce62994 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -961,16 +961,18 @@ SOURCES += \ src/VehicleSetup/PX4FirmwareUpgradeThread.cc \ }} -# ArduPilot FirmwarePlugin +# ArduPilot Specific -!ArdupilotDisabled { - INCLUDEPATH += \ +ArdupilotEnabled { + HEADERS += \ src/Settings/APMMavlinkStreamRateSettings.h \ SOURCES += \ src/Settings/APMMavlinkStreamRateSettings.cc \ } +# ArduPilot FirmwarePlugin + APMFirmwarePlugin { RESOURCES *= src/FirmwarePlugin/APM/APMResources.qrc -- 2.22.0