Merge

mavground.pri

@@ -58,21 +58,21 @@ message(Qt version $$[QT_VERSION])
 
 # MAC OS X
 macx { 
-	message(Building for Mac OS X)
+    message(Building for Mac OS X)
 
-	CONFIG += x86_64
-	CONFIG -= x86 static
+    CONFIG += x86_64
+    CONFIG -= x86 static
 
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
 
     DESTDIR = $$BASEDIR/bin/mac
     INCLUDEPATH += -framework SDL \
                 $$BASEDIR/MAVLink/src
 
     LIBS += -framework IOKit \
-		-framework SDL \
-		-framework CoreFoundation \
-		-framework ApplicationServices \
+        -framework SDL \
+        -framework CoreFoundation \
+        -framework ApplicationServices \
         -lm
 
     DEFINES += _TTY_POSIX_
@@ -129,26 +129,18 @@ linux-g++ {
 }
 
 
-# Windows (32bit)
+# Windows (32bit/64bit)
 win32 { 
 
     message(Building for Windows Platform (32/64bit))
     
     # Special settings for debug
-        #CONFIG += CONSOLE
+    #CONFIG += CONSOLE
     LIBS += -L$$BASEDIR\lib\sdl\win32 \
         -lmingw32 -lSDLmain -lSDL -mwindows
     
     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 {

mavground.pro

@@ -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 \