From d58831d3f1d9cb73721174480c3fc72dda3e47c4 Mon Sep 17 00:00:00 2001 From: James Cotton Date: Mon, 20 Aug 2012 15:29:03 -0500 Subject: [PATCH] GCS: Add conditial flag to include OGS plugins. Must compile with qmake CONFIG+=OSG To include this module from the command line: make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs --- Makefile | 2 +- ground/openpilotgcs/src/plugins/plugins.pro | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 47b9a0a3c..2087e7fc4 100644 --- a/Makefile +++ b/Makefile @@ -473,7 +473,7 @@ gcs_clean: openpilotgcs_clean openpilotgcs: uavobjects_gcs $(V1) mkdir -p $(BUILD_DIR)/ground/$@ $(V1) ( cd $(BUILD_DIR)/ground/$@ && \ - $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+=$(GCS_BUILD_CONF) && \ + $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+=$(GCS_BUILD_CONF) $(GCS_QMAKE_OPTS) && \ $(MAKE) -w ; \ ) diff --git a/ground/openpilotgcs/src/plugins/plugins.pro b/ground/openpilotgcs/src/plugins/plugins.pro index f441d52b3..8580ba2ea 100644 --- a/ground/openpilotgcs/src/plugins/plugins.pro +++ b/ground/openpilotgcs/src/plugins/plugins.pro @@ -197,11 +197,13 @@ plugin_uavobjectutil.depends += plugin_uavobjects SUBDIRS += plugin_uavobjectutil # OSG Earth View plugin -plugin_osgearthview.subdir = osgearthview -plugin_osgearthview.depends = plugin_coreplugin -plugin_osgearthview.depends += plugin_uavobjects -plugin_osgearthview.depends += plugin_uavobjectwidgetutils -SUBDIRS += plugin_osgearthview +OSG { + plugin_osgearthview.subdir = osgearthview + plugin_osgearthview.depends = plugin_coreplugin + plugin_osgearthview.depends += plugin_uavobjects + plugin_osgearthview.depends += plugin_uavobjectwidgetutils + SUBDIRS += plugin_osgearthview +} # Magic Waypoint gadget plugin_magicwaypoint.subdir = magicwaypoint