From e5b7f47b30ae03a2f788d80fe51407f567374ae4 Mon Sep 17 00:00:00 2001
From: pixhawk <tv@.(none)>
Date: Fri, 3 Dec 2010 11:34:28 +0100
Subject: [PATCH] Working MSVC build

---
 qgroundcontrol.pri | 22 +++++++++++++++-------
 qgroundcontrol.pro |  3 ++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index 24bdd3daa..a5cc13bfb 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -287,22 +287,30 @@ win32-msvc2008 {
     LIBS += -L$$BASEDIR/lib/sdl/msvc/lib \
              -lSDLmain -lSDL
 
-message("Building support for OSGEARTH")
-DEPENDENCIES_PRESENT += osgearth
+exists($$BASEDIR/lib/osg123) {
+message("Building support for OSG")
+DEPENDENCIES_PRESENT += osg
+
 # Include OpenSceneGraph and osgEarth libraries
 INCLUDEPATH += $$BASEDIR/lib/osgEarth/win32/include \
     $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/include
-LIBS += -L$$BASEDIR/lib/osgEarth/win32/lib \
-    -L$$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib \
+LIBS += -L$$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/lib \
     -losg \
     -losgViewer \
 	-losgGA \
 	-losgDB \
 	-losgText \
-	-lOpenThreads \
-    -losgEarth \
-	-losgEarthUtil
+        -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
 
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 69ea7e7c7..5713c0c33 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -222,7 +222,7 @@ HEADERS += src/MG.h \
     src/ui/linechart/IncrementalPlot.h \
     src/ui/map/Waypoint2DIcon.h \
     src/ui/map/MAV2DIcon.h \
-    src/ui/QGCRemoteControlView.h \ # src/ui/WaypointGlobalView.h \
+    src/ui/QGCRemoteControlView.h \
     src/ui/RadioCalibration/RadioCalibrationData.h \
     src/ui/RadioCalibration/RadioCalibrationWindow.h \
     src/ui/RadioCalibration/AirfoilServoCalibrator.h \
@@ -230,6 +230,7 @@ HEADERS += src/MG.h \
     src/ui/RadioCalibration/CurveCalibrator.h \
     src/ui/RadioCalibration/AbstractCalibrator.h \
     src/comm/QGCMAVLink.h
+	 # src/ui/WaypointGlobalView.h \
 
 
 contains(DEPENDENCIES_PRESENT, osg) { 
-- 
2.22.0