From 058438f0495ab353638036eb495cdc14b39ce7b1 Mon Sep 17 00:00:00 2001
From: pixhawk <mavteam@student.ethz.ch>
Date: Thu, 30 Sep 2010 17:27:51 +0200
Subject: [PATCH] now compiles with qt 4.7 and 64-bit linux, fixed a bug in
 SerialLink

---
 .gitignore            |  2 +-
 qgroundcontrol.pri    | 41 +++++++++++++++++++++++++++++++++++++++++
 qgroundcontrol.pro    |  2 +-
 src/comm/SerialLink.h |  2 +-
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e48c0104..0faedcd51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ obj
 bin/*.exe
 bin/*.txt
 bin/mac
-*pro.user
+*pro.user*
 qrc_*.cpp
 *.Debug
 *.Release
diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index 89f9c62a9..de14e8f99 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -108,8 +108,49 @@ linux-g++ {
     LIBS += \
         -L/usr/lib \
         -lm \
+        -lflite_cmu_us_kal16 \
+        -lflite_usenglish \
+        -lflite_cmulex \
+        -lflite \
+        -lSDL \
+        -lSDLmain \
+        -lglut
+
         #-lflite_cmu_us_rms \
         #-lflite_cmu_us_slt \
+}
+
+linux-g++-64 {
+    CONFIG += debug
+
+    debug {
+        DESTDIR = $$BASEDIR
+    }
+
+    release {
+        DESTDIR = $$BASEDIR
+    }
+    INCLUDEPATH += /usr/include \
+                   /usr/include/qt4/phonon
+              # $$BASEDIR/lib/flite/include \
+              # $$BASEDIR/lib/flite/lang
+
+
+    HARDWARE_PLATFORM = $$system(uname -a)
+    contains( HARDWARE_PLATFORM, x86_64 ) {
+        # 64-bit Linux
+        #LIBS += \
+            #-L$$BASEDIR/lib/flite/linux64
+        message(Building for GNU/Linux 64bit/x64)
+    } else {
+        # 32-bit Linux
+        #LIBS += \
+           #-L$$BASEDIR/lib/flite/linux32
+        message(Building for GNU/Linux 32bit/i386)
+    }
+    LIBS += \
+        -L/usr/lib \
+        -lm \
         -lflite_cmu_us_kal16 \
         -lflite_usenglish \
         -lflite_cmulex \
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 1c3a72988..22846765c 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -55,7 +55,7 @@ FORMS += src/ui/MainWindow.ui \
     src/ui/UASControl.ui \
     src/ui/UASList.ui \
     src/ui/UASInfo.ui \
-    src/ui/LineChart.ui \
+    src/ui/Linechart.ui \
     src/ui/UASView.ui \
     src/ui/ParameterInterface.ui \
     src/ui/WaypointList.ui \
diff --git a/src/comm/SerialLink.h b/src/comm/SerialLink.h
index 09837e1b2..b20f6d3ce 100644
--- a/src/comm/SerialLink.h
+++ b/src/comm/SerialLink.h
@@ -57,7 +57,7 @@ class SerialLink : public SerialLinkInterface {
     //Q_INTERFACES(SerialLinkInterface:LinkInterface)
 
 public:
-    SerialLink(QString portname=NULL, BaudRateType baudrate=BAUD57600, FlowType flow=FLOW_OFF, ParityType parity=PAR_NONE, DataBitsType dataBits=DATA_8, StopBitsType stopBits=STOP_1);
+    SerialLink(QString portname = "", BaudRateType baudrate=BAUD57600, FlowType flow=FLOW_OFF, ParityType parity=PAR_NONE, DataBitsType dataBits=DATA_8, StopBitsType stopBits=STOP_1);
     ~SerialLink();
 
     static const int poll_interval = SERIAL_POLL_INTERVAL; ///< Polling interval, defined in configuration.h
-- 
2.22.0