From 42213b21f7da6e959e07d8e82245d562bfdb49df Mon Sep 17 00:00:00 2001 From: James Cotton Date: Thu, 13 Sep 2012 09:44:04 -0500 Subject: [PATCH] Make OSG selection a QMake config option (OSG) To include this module from the command line: make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs --- Makefile | 2 +- ground/openpilotgcs/src/plugins/pfdqml/pfdqml.pro | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6564abc44..b5d2bce53 100644 --- a/Makefile +++ b/Makefile @@ -471,7 +471,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/pfdqml/pfdqml.pro b/ground/openpilotgcs/src/plugins/pfdqml/pfdqml.pro index e1ba3bbd6..55f15b4d2 100644 --- a/ground/openpilotgcs/src/plugins/pfdqml/pfdqml.pro +++ b/ground/openpilotgcs/src/plugins/pfdqml/pfdqml.pro @@ -3,7 +3,9 @@ TARGET = PfdQml QT += svg QT += opengl QT += declarative -#DEFINES += USE_OSG +OSG { + DEFINES += USE_OSG +} include(../../openpilotgcsplugin.pri) include(../../plugins/coreplugin/coreplugin.pri)