Cleanup and remove old files

ArduPilot · Nov 20, 2016 · d64c2e3 · d64c2e3
1 parent c4b4419
commit d64c2e3
Show file tree

Hide file tree

Showing 127 changed files with 66 additions and 43,982 deletions.
diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
@@ -22,195 +22,43 @@ WindowsBuild {
 }
 
 #
-# QUpgrade
+# MAVLink (Set for MAVLink 1.0)
 #
 
-exists(qupgrade) {
-    message(Including support for QUpgrade)
-
-    DEFINES += QUPGRADE_SUPPORT
-
-    INCLUDEPATH += qupgrade/src/apps/qupgrade
-
-    FORMS += \
-        qupgrade/src/apps/qupgrade/dialog_bare.ui \
-        qupgrade/src/apps/qupgrade/boardwidget.ui
-
-    HEADERS += \
-        qupgrade/src/apps/qupgrade/qgcfirmwareupgradeworker.h \
-        qupgrade/src/apps/qupgrade/uploader.h \
-        qupgrade/src/apps/qupgrade/dialog_bare.h \
-        qupgrade/src/apps/qupgrade/boardwidget.h
-
-    SOURCES += \
-        qupgrade/src/apps/qupgrade/qgcfirmwareupgradeworker.cpp \
-        qupgrade/src/apps/qupgrade/uploader.cpp \
-        qupgrade/src/apps/qupgrade/dialog_bare.cpp \
-        qupgrade/src/apps/qupgrade/boardwidget.cpp
-
-    RESOURCES += \
-        qupgrade/qupgrade.qrc
-
-    LinuxBuild:CONFIG += qesp_linux_udev
-
-    include(qupgrade/libs/qextserialport/src/qextserialport.pri)
-} else {
-    message(Skipping support for QUpgrade)
-}
-
-#
-# MAVLink
-#
-
-MAVLINK_CONF = ""
-MAVLINKPATH = $$BASEDIR/libs/mavlink/include/mavlink/v1.0
+MAVLINKPATH_REL = libs/mavlink/include/mavlink/v1.0
+MAVLINKPATH = $$BASEDIR/$$MAVLINKPATH_REL
+MAVLINK_CONF = ardupilotmega
 DEFINES += MAVLINK_NO_DATA
 
-# If the user config file exists, it will be included.
-# if the variable MAVLINK_CONF contains the name of an
-# additional project, QGroundControl includes the support
-# of custom MAVLink messages of this project. It will also
-# create a QGC_USE_{AUTOPILOT_NAME}_MESSAGES macro for use
-# within the actual code.
-exists(user_config.pri) {
-    include(user_config.pri)
-    message("----- USING CUSTOM USER QGROUNDCONTROL CONFIG FROM user_config.pri -----")
-    message("Adding support for additional MAVLink messages for: " $$MAVLINK_CONF)
-    message("------------------------------------------------------------------------")
-} else {
-    MAVLINK_CONF += ardupilotmega
-}
-INCLUDEPATH += $$MAVLINKPATH
-isEmpty(MAVLINK_CONF) {
-    INCLUDEPATH += $$MAVLINKPATH/common
-message("Using mavlink common")
-} else {
-    INCLUDEPATH += $$MAVLINKPATH/$$MAVLINK_CONF
-message("Using mavlink " + $$MAVLINK_CONF)
-    DEFINES += $$sprintf('QGC_USE_%1_MESSAGES', $$upper($$MAVLINK_CONF))
+# First we select the dialect, checking for valid user selection
+# Users can override all other settings by specifying MAVLINK_CONF as an argument to qmake
+!isEmpty(MAVLINK_CONF) {
+    message($$sprintf("Using MAVLink dialect '%1'.", $$MAVLINK_CONF))
 }
 
-#
-# MAVLink generator (deprecated)
-#
-
-DEPENDPATH += \
-    src/apps/mavlinkgen
-
-INCLUDEPATH += \
-    src/apps/mavlinkgen \
-    src/apps/mavlinkgen/ui \
-    src/apps/mavlinkgen/generator
-
-#include(src/apps/mavlinkgen/mavlinkgen.pri)
-
-#
-# OpenSceneGraph
-#
-
-#Remove OSG support, as it's only valid for Qt4, not Qt5
-#MacBuild {
-#    # GLUT and OpenSceneGraph are part of standard install on Mac
-#	CONFIG += OSGDependency
-
-#    INCLUDEPATH += \
-#        $$BASEDIR/libs/lib/mac64/include
-
-#	LIBS += \
-#        -L$$BASEDIR/libs/lib/mac64/lib \
-#        -losgWidget
-#}
-
-#Remove OSG support, as it's only valid for Qt4, not Qt5
-#LinuxBuild {
-#	exists(/usr/include/osg) | exists(/usr/local/include/osg) {
-#        CONFIG += OSGDependency
-#        exists(/usr/include/osg/osgQt) | exists(/usr/include/osgQt) | exists(/usr/local/include/osg/osgQt) | exists(/usr/local/include/osgQt) {
-#            message("Including support for Linux OpenSceneGraph Qt")
-#            LIBS += -losgQt
-#            DEFINES += QGC_OSG_QT_ENABLED
-#        } else {
-#            message("Skipping support for Linux OpenSceneGraph Qt")
-#        }
-#	}
-#}
-
-WindowsBuild {
-	exists($$BASEDIR/libs/lib/osg123) {
-        CONFIG += OSGDependency
-
-		INCLUDEPATH += \
-            $$BASEDIR/libs/lib/osgEarth/win32/include \
-			$$BASEDIR/libs/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/include
-
-		LIBS += -L$$BASEDIR/libs/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib
-	}
-}
-
-OSGDependency {
-    message("Including support for OpenSceneGraph")
-
-	DEFINES += QGC_OSG_ENABLED
-
-    LIBS += \
-        -losg \
-        -losgViewer \
-        -losgGA \
-        -losgDB \
-        -losgText \
-        -lOpenThreads
-
-    HEADERS += \
-        src/ui/map3D/gpl.h \
-        src/ui/map3D/CameraParams.h \
-        src/ui/map3D/ViewParamWidget.h \
-        src/ui/map3D/SystemContainer.h \
-        src/ui/map3D/SystemViewParams.h \
-        src/ui/map3D/GlobalViewParams.h \
-        src/ui/map3D/SystemGroupNode.h \
-        src/ui/map3D/Q3DWidget.h \
-        src/ui/map3D/GCManipulator.h \
-        src/ui/map3D/ImageWindowGeode.h \
-        src/ui/map3D/PixhawkCheetahNode.h \
-        src/ui/map3D/Pixhawk3DWidget.h \
-        src/ui/map3D/Q3DWidgetFactory.h \
-        src/ui/map3D/WebImageCache.h \
-        src/ui/map3D/WebImage.h \
-        src/ui/map3D/TextureCache.h \
-        src/ui/map3D/Texture.h \
-        src/ui/map3D/Imagery.h \
-        src/ui/map3D/HUDScaleGeode.h \
-        src/ui/map3D/WaypointGroupNode.h \
-        src/ui/map3D/TerrainParamDialog.h \
-        src/ui/map3D/ImageryParamDialog.h
+# Then we add the proper include paths dependent on the dialect.
+INCLUDEPATH += $$MAVLINKPATH
 
-    SOURCES += \
-        src/ui/map3D/gpl.cc \
-        src/ui/map3D/CameraParams.cc \
-        src/ui/map3D/ViewParamWidget.cc \
-        src/ui/map3D/SystemContainer.cc \
-        src/ui/map3D/SystemViewParams.cc \
-        src/ui/map3D/GlobalViewParams.cc \
-        src/ui/map3D/SystemGroupNode.cc \
-        src/ui/map3D/Q3DWidget.cc \
-        src/ui/map3D/ImageWindowGeode.cc \
-        src/ui/map3D/GCManipulator.cc \
-        src/ui/map3D/PixhawkCheetahNode.cc \
-        src/ui/map3D/Pixhawk3DWidget.cc \
-        src/ui/map3D/Q3DWidgetFactory.cc \
-        src/ui/map3D/WebImageCache.cc \
-        src/ui/map3D/WebImage.cc \
-        src/ui/map3D/TextureCache.cc \
-        src/ui/map3D/Texture.cc \
-        src/ui/map3D/Imagery.cc \
-        src/ui/map3D/HUDScaleGeode.cc \
-        src/ui/map3D/WaypointGroupNode.cc \
-        src/ui/map3D/TerrainParamDialog.cc \
-        src/ui/map3D/ImageryParamDialog.cc
+exists($$MAVLINKPATH/common) {
+    !isEmpty(MAVLINK_CONF) {
+        count(MAVLINK_CONF, 1) {
+            exists($$MAVLINKPATH/$$MAVLINK_CONF) {
+                INCLUDEPATH += $$MAVLINKPATH/$$MAVLINK_CONF
+                DEFINES += $$sprintf('QGC_USE_%1_MESSAGES', $$upper($$MAVLINK_CONF))
+            } else {
+                error($$sprintf("MAVLink dialect '%1' does not exist at '%2'!", $$MAVLINK_CONF, $$MAVLINKPATH_REL))
+            }
+        } else {
+            error(Only a single mavlink dialect can be specified in MAVLINK_CONF)
+        }
+    } else {
+        INCLUDEPATH += $$MAVLINKPATH/common
+    }
 } else {
-    message("Skipping support for OpenSceneGraph")
+    error($$sprintf("MAVLink folder does not exist at '%1'! Run 'git submodule init && git submodule update' on the command line.",$$MAVLINKPATH_REL))
 }
 
+
 #
 # Google Earth
 #
@@ -227,37 +75,6 @@ MacBuild | WindowsBuild : contains(GOOGLEEARTH, enable) { #fix this to make sens
     message(Skipping support for Google Earth)
 }
 
-#
-# Protcol Buffers for PixHawk
-#
-
-LinuxBuild : contains(MAVLINK_CONF, pixhawk) {
-    exists(/usr/local/include/google/protobuf) | exists(/usr/include/google/protobuf) {
-        message("Including support for Protocol Buffers")
-
-        DEFINES += QGC_PROTOBUF_ENABLED
-
-        LIBS += \
-            -lprotobuf \
-            -lprotobuf-lite \
-            -lprotoc
-
-        HEADERS += \
-            libs/mavlink/include/mavlink/v1.0/pixhawk/pixhawk.pb.h \
-            src/ui/map3D/ObstacleGroupNode.h \
-            src/ui/map3D/GLOverlayGeode.h
-
-        SOURCES += \
-            libs/mavlink/share/mavlink/src/v1.0/pixhawk/pixhawk.pb.cc \
-            src/ui/map3D/ObstacleGroupNode.cc \
-            src/ui/map3D/GLOverlayGeode.cc
-    } else {
-        message("Skipping support for Protocol Buffers")
-    }
-} else {
-    message("Skipping support for Protocol Buffers")
-}
-
 #
 # libfreenect Kinect support
 #