rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

Make OSG selection a QMake config option (OSG)

Browse Source 
To include this module from the command line:
    make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
This commit is contained in:
James Cotton 2012-09-13 09:44:04 -05:00
parent abbf858123
commit 42213b21f7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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 ; \
)

4
ground/openpilotgcs/src/plugins/pfdqml/pfdqml.pro
View File

@ -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)