From 1c61eec81b74186e3d0f94620b0109f3033a4070 Mon Sep 17 00:00:00 2001
From: James Goppert <jgoppert@w7.hsl.dynalias.com>
Date: Tue, 14 Dec 2010 10:22:51 -0500
Subject: [PATCH] Fixed build for linux.

---
 qgroundcontrol.pri            | 1 +
 src/ui/map3D/GCManipulator.cc | 6 +++---
 src/ui/map3D/QMap3D.cc        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index d6a975b..2b2e46d 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -158,6 +158,7 @@ linux-g++ {
     QMAKE_POST_LINK += cp -rf $$BASEDIR/audio $$DESTDIR/.
 
     INCLUDEPATH += /usr/include \
+				   /usr/local/include \
                    /usr/include/qt4/phonon
               # $$BASEDIR/lib/flite/include \
               # $$BASEDIR/lib/flite/lang
diff --git a/src/ui/map3D/GCManipulator.cc b/src/ui/map3D/GCManipulator.cc
index 6f2fb0e..05c9b24 100644
--- a/src/ui/map3D/GCManipulator.cc
+++ b/src/ui/map3D/GCManipulator.cc
@@ -254,10 +254,10 @@ GCManipulator::calcMovement(void)
     if (buttonMask == GUIEventAdapter::LEFT_MOUSE_BUTTON)
     {
         // rotate camera
-#ifdef __APPLE__
-        osg::Vec3d axis;
-#else
+#ifdef __WIN32__
         osg::Vec3 axis;
+#else
+        osg::Vec3d axis;
 #endif
         float angle;
 
diff --git a/src/ui/map3D/QMap3D.cc b/src/ui/map3D/QMap3D.cc
index ab4c98b..83ff901 100644
--- a/src/ui/map3D/QMap3D.cc
+++ b/src/ui/map3D/QMap3D.cc
@@ -39,7 +39,7 @@ QMap3D::QMap3D(QWidget * parent, const char * name, WindowFlags f) :
         QWidget(parent,f)
 {
     setupUi(this);
-    graphicsView->setCameraManipulator(new osgEarthUtil::EarthManipulator);
+    graphicsView->setCameraManipulator(new osgEarth::Util::EarthManipulator);
     graphicsView->setSceneData(new osg::Group);
     graphicsView->updateCamera();
     show();