mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-29 14:52:12 +01:00
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
This commit is contained in:
parent
113a759cd9
commit
d58831d3f1
2
Makefile
2
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 ; \
|
||||
)
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user