Fixed a compile error occuring on *nix systems due to VS2010 changes

qgroundcontrol.pri

-#-------------------------------------------------
-#
+# -------------------------------------------------
 # QGroundControl - Micro Air Vehicle Groundstation
-#
 # Please see our website at <http://qgroundcontrol.org>
-#
-# Author:
-# Lorenz Meier <mavteam@student.ethz.ch>
-#
-# (c) 2009-2010 PIXHAWK Team
-#
-# This file is part of the mav groundstation project
+# Maintainer:
+# Lorenz Meier <lm@inf.ethz.ch>
+# (c) 2009-2011 QGroundControl Developers
+# This file is part of the open groundstation project
 # QGroundControl is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -20,13 +15,7 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with QGroundControl. If not, see <http://www.gnu.org/licenses/>.
-#
-#-------------------------------------------------
-
-
-#$$BASEDIR/lib/qextserialport/include
-#               $$BASEDIR/lib/openjaus/libjaus/include \
-#               $$BASEDIR/lib/openjaus/libopenJaus/include
+# -------------------------------------------------
 
 message(Qt version $$[QT_VERSION])
 message(Using Qt from $$[QTDIR])
@@ -36,7 +25,11 @@ release {
 #    DEFINES += QT_NO_WARNING_OUTPUT
 }
 
-QMAKE_POST_LINK += $$quote(echo "Copying files"$$escape_expand(\\n))
+win32-msvc2008|win32-msvc2010 {
+    QMAKE_POST_LINK += $$quote(echo "Copying files"$$escape_expand(\\n))
+} else {
+    QMAKE_POST_LINK += $$quote(echo "Copying files")
+}
 
 # Turn off serial port warnings
 DEFINES += _TTY_NOWARN_
@@ -181,8 +174,6 @@ message("Compiling for linux 32")
     INCLUDEPATH += /usr/include \
                    /usr/local/include \
                    /usr/include/qt4/phonon
-              # $$BASEDIR/lib/flite/include \
-              # $$BASEDIR/lib/flite/lang
 
 
     message(Building for GNU/Linux 32bit/i386)
@@ -256,8 +247,6 @@ linux-g++-64 {
 
     INCLUDEPATH += /usr/include \
                    /usr/include/qt4/phonon
-              # $$BASEDIR/lib/flite/include \
-              # $$BASEDIR/lib/flite/lang
 
 
     # 64-bit Linux
@@ -358,7 +347,7 @@ exists($$BASEDIR/lib/osg123) {
 message("Building support for OSG")
 DEPENDENCIES_PRESENT += osg
 
-# Include OpenSceneGraph and osgEarth libraries
+# Include OpenSceneGraph
 INCLUDEPATH += $$BASEDIR/lib/osgEarth/win32/include \
     $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/include
 LIBS += -L$$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib \
@@ -369,14 +358,6 @@ LIBS += -L$$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib \
     -losgText \
     -lOpenThreads
 DEFINES += QGC_OSG_ENABLED
-exists($$BASEDIR/lib/osgEarth123) {
-    DEPENDENCIES_PRESENT += osgearth
-    message("Building support for osgEarth")
-    DEFINES += QGC_OSGEARTH_ENABLED
-    LIBS += -L$$BASEDIR/lib/osgEarth/win32/lib \
-        -losgEarth \
-        -losgEarthUtil
-}
 }
 
     RC_FILE = $$BASEDIR/qgroundcontrol.rc

qgroundcontrol.pro

@@ -16,62 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with QGroundControl. If not, see <http://www.gnu.org/licenses/>.
 # -------------------------------------------------
-# Include QMapControl map library
-# prefer version from external directory /
-# from http://github.com/pixhawk/qmapcontrol/
-# over bundled version in lib directory
-# Version from GIT repository is preferred
-# include ( "../qmapcontrol/QMapControl/QMapControl.pri" ) #{
-# Include bundled version if necessary
-# include(lib/QMapControl/QMapControl.pri)
-include(src/libs/nmea/nmea.pri)
-
-# EIGEN matrix library (header-only)
-INCLUDEPATH += src/libs/eigen
-
-# This is a HACK - linking to openpilot repo for now
-# OPMapControl is a OpenPilot-independent map library
-# provided by the OpenPilot team - thanks, great piece
-# of open-source software!
-# (We're not reusing any part of the OP GCS, just the map library)
-
-
-# Try to get it from OP mainline, if this fails fall back to internal copies
-exists(../openpilot-xxxxxxx/ground/openpilotgcs/src/libs) {
-include(../openpilot/ground/openpilotgcs/src/libs/utils/utils_external.pri)
-include(../openpilot/ground/openpilotgcs/src/libs/opmapcontrol/opmapcontrol_external.pri)
-DEPENDPATH += \
-    ../openpilot/ground/openpilotgcs/src/libs/utils \
-    ../openpilot/ground/openpilotgcs/src/libs/utils/src \
-    ../openpilot/ground/openpilotgcs/src/libs/opmapcontrol \
-    ../openpilot/ground/openpilotgcs/src/libs/opmapcontrol/src
 
-INCLUDEPATH += \
-    ../openpilot/ground/openpilotgcs/src/libs/utils \
-    ../openpilot/ground/openpilotgcs/src/libs \
-    ../openpilot/ground/openpilotgcs/src/libs/opmapcontrol
 
-    message("----- USING MAINLINE OPENPILOT FROM ../openpilot -----")
-    message("Using OpenPilot's mapcontrol library from external folder")
-    message("------------------------------------------------------------------------")
-} else {
-include(src/libs/utils/utils_external.pri)
-include(src/libs/opmapcontrol/opmapcontrol_external.pri)
-DEPENDPATH += \
-    src/libs/utils \
-    src/libs/utils/src \
-    src/libs/opmapcontrol \
-    src/libs/opmapcontrol/src \
-    src/libs/opmapcontrol/src/mapwidget
-
-INCLUDEPATH += \
-    src/libs/utils \
-    src/libs \
-    src/libs/opmapcontrol
-}
-
-# include(lib/opmapcontrol/opmapcontrol.pri)
-# message("Including bundled QMapControl version as FALLBACK. This is fine on Linux and MacOS, but not the best choice in Windows")
+# Qt configuration
 QT += network \
     opengl \
     svg \
@@ -79,6 +26,7 @@ QT += network \
     phonon \
     webkit \
     sql
+
 TEMPLATE = app
 TARGET = qgroundcontrol
 BASEDIR = $$IN_PWD
@@ -88,8 +36,34 @@ LANGUAGE = C++
 OBJECTS_DIR = $$BUILDDIR/obj
 MOC_DIR = $$BUILDDIR/moc
 UI_HEADERS_DIR = $$BUILDDIR/ui
+RCC_DIR = $$BUILDDIR/rcc
 MAVLINK_CONF = ""
 
+
+#################################################################
+# EXTERNAL LIBRARY CONFIGURATION
+
+# Include NMEA parsing library (currently unused)
+include(src/libs/nmea/nmea.pri)
+
+# EIGEN matrix library (header-only)
+INCLUDEPATH += src/libs/eigen
+
+# OPMapControl library (from OpenPilot)
+include(src/libs/utils/utils_external.pri)
+include(src/libs/opmapcontrol/opmapcontrol_external.pri)
+DEPENDPATH += \
+    src/libs/utils \
+    src/libs/utils/src \
+    src/libs/opmapcontrol \
+    src/libs/opmapcontrol/src \
+    src/libs/opmapcontrol/src/mapwidget
+
+INCLUDEPATH += \
+    src/libs/utils \
+    src/libs \
+    src/libs/opmapcontrol
+
 # If the user config file exists, it will be included.
 # if the variable MAVLINK_CONF contains the name of an
 # additional project, QGroundControl includes the support
@@ -145,14 +119,12 @@ contains(MAVLINK_CONF, ardupilotmega) {
     DEFINES += QGC_USE_ARDUPILOTMEGA_MESSAGES
 }
 
-# }
+
 # Include general settings for QGroundControl
 # necessary as last include to override any non-acceptable settings
 # done by the plugins above
 include(qgroundcontrol.pri)
 
-
-
 # Include MAVLink generator
 DEPENDPATH += \
     src/apps/mavlinkgen
@@ -181,19 +153,14 @@ INCLUDEPATH += . \
     thirdParty/qserialport/src \
     src/libs/qextserialport
 
-# Include serial port library
-# include(src/lib/qextserialport/qextserialport.pri)
-# include qserial library
+# Include serial port library (QSerial)
 include(thirdParty/qserialport/qgroundcontrol-qserialport.pri)
 
-# Serial port detection
+# Serial port detection (ripped-off from qextserialport library)
 macx::SOURCES += src/libs/qextserialport/qextserialenumerator_osx.cpp
 linux-g++::SOURCES += src/libs/qextserialport/qextserialenumerator_unix.cpp
 win32::SOURCES += src/libs/qextserialport/qextserialenumerator_win.cpp
 
-# ../mavlink/include \
-# MAVLink/include \
-# mavlink/include
 # Input
 FORMS += src/ui/MainWindow.ui \
     src/ui/CommSettings.ui \
@@ -476,7 +443,11 @@ SOURCES += src/main.cc \
     src/ui/map/Waypoint2DIcon.cc \
     src/ui/map/QGCMapTool.cc \
     src/ui/map/QGCMapToolBar.cc
+
+# Enable Google Earth only on Mac OS and Windows with Visual Studio compiler
 macx|win32-msvc2008|win32-msvc2010::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
+
+# Enable OSG only if it has been found
 contains(DEPENDENCIES_PRESENT, osg) { 
     message("Including sources for OpenSceneGraph")
     
@@ -508,7 +479,9 @@ contains(DEPENDENCIES_PRESENT, libfreenect) {
     # Enable only if libfreenect is available
     SOURCES += src/input/Freenect.cc
 }
-RESOURCES += mavground.qrc
+
+# Add icons and other resources
+RESOURCES += qgroundcontrol.qrc
 
 # Include RT-LAB Library
 win32:exists(src/lib/opalrt/OpalApi.h):exists(C:/OPAL-RT/RT-LAB7.2.4/Common/bin) {