Merged

qgroundcontrol.pri

@@ -107,9 +107,10 @@ macx {
 
 # GNU/Linux
 linux-g++ {
-    
+
     debug {
         DESTDIR = $$BUILDDIR/debug
+        CONFIG += debug
     }
 
     release {
@@ -124,18 +125,8 @@ linux-g++ {
               # $$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)
-    }
+    message(Building for GNU/Linux 32bit/i386)
+
     LIBS += \
         -L/usr/lib \
         -lm \
@@ -186,10 +177,10 @@ linux-g++ {
 }
 
 linux-g++-64 {
-    CONFIG += debug
 
     debug {
         DESTDIR = $$BUILDDIR/debug
+        CONFIG += debug
     }
 
     release {
@@ -197,24 +188,16 @@ linux-g++-64 {
     }
 
     QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
+
     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)
-    }
+    # 64-bit Linux
+    message(Building for GNU/Linux 64bit/x64 (g++-64))
+
     LIBS += \
         -L/usr/lib \
         -lm \
@@ -251,7 +234,6 @@ linux-g++-64 {
     LIBS += -lfreenect
     DEFINES += QGC_LIBFREENECT_ENABLED
     }
-
 }
 
 # Windows (32bit)

qgroundcontrol.pro

@@ -37,8 +37,7 @@ BASEDIR = $$IN_PWD
 TARGETDIR = $$OUT_PWD
 BUILDDIR = $$TARGETDIR/build
 LANGUAGE = C++
-CONFIG += debug_and_release \
-    console
+CONFIG += console
 OBJECTS_DIR = $$BUILDDIR/obj
 MOC_DIR = $$BUILDDIR/moc
 UI_HEADERS_DIR = src/ui/generated
@@ -351,9 +350,9 @@ contains(DEPENDENCIES_PRESENT, osgearth) {
 }
 }
 
-contains(DEPENDENCIES_PRESENT, libfreenect) { 
+contains(DEPENDENCIES_PRESENT, libfreenect) {
     message("Including sources for libfreenect")
-    
+
     # Enable only if libfreenect is available
     SOURCES += src/input/Freenect.cc
 }