mavlink2

App/App.pro

@@ -100,13 +100,13 @@ INCLUDEPATH += $$PWD/../thirdpart/include
 
 #添加mavlink目录(给mavlinknode模块打补丁)
 
-INCLUDEPATH += $$PWD/../mavlink3 \
-               $$PWD/../mavlink3/ardupilotmega \
-               $$PWD/../mavlink3/common \
-               $$PWD/../mavlink3/icarous \
-               $$PWD/../mavlink3/uAvionix \
-               $$PWD/../mavlink3/XYK \
-               $$PWD/../mavlink3/message_definitions
+INCLUDEPATH += $$PWD/../mavlink \
+               $$PWD/../mavlink/ardupilotmega \
+               $$PWD/../mavlink/common \
+               $$PWD/../mavlink/icarous \
+               $$PWD/../mavlink/uAvionix \
+               $$PWD/../mavlink/XYK \
+               $$PWD/../mavlink/message_definitions
 
 
 # Capture whether this is a release/debug build.

MavLinkNode/MavLinkNode.pro

@@ -8,20 +8,16 @@ QT    += core gui network
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
+# Target name.
+TARGET = MavLinkNode
 
 
-
-
-# Capture whether this is a release/debug build.
-CONFIG(debug, debug|release) {
-    # Target name.
-    TARGET = MavLinkNoded
-}
-CONFIG(release, debug|release) {
-    # Target name.
-    TARGET = MavLinkNode
+CONFIG(debug, debug|release){
+    # 在DEBUG 版本后加入 d后缀
+    TARGET = $$join(TARGET,,,d)
 }
 
+
 TEMPLATE = lib
 
 DEFINES += MAV_LIBRARY
@@ -90,13 +86,13 @@ CONFIG(release, debug|release) {
 #添加mavlink目录
 
 
-INCLUDEPATH += $$PWD/../mavlink3 \
-               $$PWD/../mavlink3/ardupilotmega \
-               $$PWD/../mavlink3/common \
-               $$PWD/../mavlink3/icarous \
-               $$PWD/../mavlink3/uAvionix \
-               $$PWD/../mavlink3/XYK \
-               $$PWD/../mavlink3/message_definitions
+INCLUDEPATH += $$PWD/../mavlink \
+               $$PWD/../mavlink/ardupilotmega \
+               $$PWD/../mavlink/common \
+               $$PWD/../mavlink/icarous \
+               $$PWD/../mavlink/uAvionix \
+               $$PWD/../mavlink/XYK \
+               $$PWD/../mavlink/message_definitions
 
 
 

dlink/dlink.pro

@@ -54,13 +54,13 @@ SOURCES += \
 INCLUDEPATH += $$PWD/../thirdpart/include
 
 #添加mavlink目录
-INCLUDEPATH += $$PWD/../mavlink3 \
-               $$PWD/../mavlink3/ardupilotmega \
-               $$PWD/../mavlink3/common \
-               $$PWD/../mavlink3/icarous \
-               $$PWD/../mavlink3/uAvionix \
-               $$PWD/../mavlink3/XYK \
-               $$PWD/../mavlink3/message_definitions
+INCLUDEPATH += $$PWD/../mavlink \
+               $$PWD/../mavlink/ardupilotmega \
+               $$PWD/../mavlink/common \
+               $$PWD/../mavlink/icarous \
+               $$PWD/../mavlink/uAvionix \
+               $$PWD/../mavlink/XYK \
+               $$PWD/../mavlink/message_definitions
 
 
 

opmap/mapwidget/mapwidget.pro

@@ -76,13 +76,13 @@ FORMS += \
 INCLUDEPATH += $$PWD/../../thirdpart/include
 
 #添加mavlink目录
-INCLUDEPATH += $$PWD/../../mavlink3 \
-               $$PWD/../../mavlink3/ardupilotmega \
-               $$PWD/../../mavlink3/common \
-               $$PWD/../../mavlink3/icarous \
-               $$PWD/../../mavlink3/uAvionix \
-               $$PWD/../../mavlink3/XYK \
-               $$PWD/../../mavlink3/message_definitions
+INCLUDEPATH += $$PWD/../../mavlink \
+               $$PWD/../../mavlink/ardupilotmega \
+               $$PWD/../../mavlink/common \
+               $$PWD/../../mavlink/icarous \
+               $$PWD/../../mavlink/uAvionix \
+               $$PWD/../../mavlink/XYK \
+               $$PWD/../../mavlink/message_definitions
 
 # Capture whether this is a release/debug build.
 CONFIG(debug, debug|release) {