Fixed compile errors

15 years ago · dbb29707a7
4 changed files with 55 additions and 54 deletions
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@ -75,6 +75,7 @@ DEPENDPATH += . \
				@@ -75,6 +75,7 @@ DEPENDPATH += . \
    plugins
 INCLUDEPATH += . \
    lib/QMapControl \
+    $$BASEDIR/../mavlink/include \
    $$BASEDIR/../mavlink/include/common

 # ../mavlink/include \
@ -201,7 +202,7 @@ HEADERS += src/MG.h \
				@@ -201,7 +202,7 @@ HEADERS += src/MG.h \
    src/ui/map3D/WebImage.h \
    src/ui/map3D/WebImageCache.h \
    src/ui/map3D/Imagery.h \
-    src/comm/QGCMAVlink.h
+    src/comm/QGCMAVLink.h
 SOURCES += src/main.cc \
    src/Core.cc \
    src/uas/UASManager.cc \
--- a/src/comm/MAVLinkProtocol.h
+++ b/src/comm/MAVLinkProtocol.h
@ -39,8 +39,7 @@ This file is part of the QGROUNDCONTROL project
				@@ -39,8 +39,7 @@ This file is part of the QGROUNDCONTROL project
 #include <QByteArray>
 #include "ProtocolInterface.h"
 #include "LinkInterface.h"
-#include "protocol.h"
-#include "QGCMAVlink.h"
+#include "QGCMAVLink.h"

 /**
 * @brief MAVLink micro air vehicle protocol reference implementation.
--- a/src/comm/QGCMAVLink.h
+++ b/src/comm/QGCMAVLink.h
@ -31,6 +31,7 @@ This file is part of the QGROUNDCONTROL project
				@@ -31,6 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #define QGCMAVLINK_H

 #include <mavlink_types.h>
+#include <mavlink.h>

 #ifdef QGC_USE_PIXHAWK_MESSAGES
 #include <pixhawk.h>