Merge

15 years ago · bc39533214
2 changed files with 12 additions and 18 deletions
--- a/mavground.pri
+++ b/mavground.pri
@ -129,7 +129,7 @@ linux-g++ {
				@@ -129,7 +129,7 @@ linux-g++ {
 }


-# Windows (32bit)
+# Windows (32bit/64bit)
 win32 { 

    message(Building for Windows Platform (32/64bit))
@ -141,14 +141,6 @@ win32 {
				@@ -141,14 +141,6 @@ win32 {
    
    INCLUDEPATH += $$BASEDIR/lib/sdl/include/SDL
    
-    #LIBS += -L$$BASEDIR\lib\qextserialport\win32 \
-    #    -lqextserialport \
-    #    -lsetupapi
-    #    -L$$BASEDIR/lib/openjaus/libjaus/lib/win32 \
-    #    -ljaus \
-    #    -L$$BASEDIR/lib/openjaus/libopenJaus/lib/win32 \
-    #    -lopenjaus
-    
    DEFINES += _TTY_WIN_

    debug {
--- a/mavground.pro
+++ b/mavground.pro
@ -17,7 +17,9 @@ DEPENDPATH += . \
				@@ -17,7 +17,9 @@ DEPENDPATH += . \
    lib/QMapControl/src
 INCLUDEPATH += . \
    lib/QMapControl \
-    ../mavlink/src
+    ../mavlink/src \
+    MAVLink/src \
+    mavlink/src

 # Input
 FORMS += src/ui/MainWindow.ui \