Working on Windows OSG support

qgroundcontrol.pri

@@ -215,12 +215,39 @@ win32-msvc2008 {
     LIBS += -L$$BASEDIR/lib/sdl/msvc/lib \
              -lSDLmain -lSDL
 
+message("Building support for OSGEARTH")
+DEPENDENCIES_PRESENT += osgearth
+# 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 \
+    -losg \
+    -losgViewer \
+	-losgGA \
+	-losgDB \
+	-losgText \
+	-lOpenThreads \
+    -losgEarth \
+	-losgEarthUtil
+DEFINES += QGC_OSG_ENABLED
+QMAKE_CXXFLAGS += -DUSE_QT4
+
     RC_FILE = $$BASEDIR/qgroundcontrol.rc
 
     # Copy dependencies
     QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/debug/. &&
-    QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/release/. &&
 	QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/debug/. &&
+	
+	
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osg.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osgViewer.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osgGA.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osgDB.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/osg55-osgText.dll $$TARGETDIR/release/. &&
+	#QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/osgEarth_3rdparty/win32/OpenSceneGraph-2.8.2/bin/OpenThreads.dll $$TARGETDIR/release/. &&
+	
+    QMAKE_PRE_LINK += cp -f $$BASEDIR/lib/sdl/win32/SDL.dll $$TARGETDIR/release/. &&
     QMAKE_PRE_LINK += cp -rf $$BASEDIR/audio $$TARGETDIR/release/.
 }
 

qgroundcontrol.pro

@@ -35,7 +35,7 @@ TEMPLATE = app
 TARGET = qgroundcontrol
 BASEDIR = $$IN_PWD
 TARGETDIR = $$OUT_PWD
-BUILDDIR = $$TARGET_DIR/build
+BUILDDIR = $$OUT_PWD/build
 LANGUAGE = C++
 CONFIG += debug_and_release \
     console

src/GAudioOutput.cc

@@ -41,7 +41,7 @@ This file is part of the QGROUNDCONTROL project
 #endif
 
 // Speech synthesis is only supported with MSVC compiler
-#if _MSC_VER
+#if _MSC_VER2
 // Documentation: http://msdn.microsoft.com/en-us/library/ee125082%28v=VS.85%29.aspx
 #define _ATL_APARTMENT_THREADED
 
@@ -93,7 +93,7 @@ emergency(false)
     flite_init();
 #endif
 
-	#if _MSC_VER
+	#if _MSC_VER2
 
 		ISpVoice * pVoice = NULL;
 	    if (FAILED(::CoInitialize(NULL)))
@@ -134,7 +134,7 @@ emergency(false)
 
 GAudioOutput::~GAudioOutput()
 {
-#ifdef _MSC_VER
+#ifdef _MSC_VER2
 	::CoUninitialize();
 #endif
 }

src/ui/map3D/Pixhawk3DWidget.cc

@@ -316,7 +316,7 @@ Pixhawk3DWidget::createGrid(void)
     // draw a 20m x 20m grid with 0.25m resolution
     for (float i = -radius; i <= radius; i += resolution)
     {
-        if (fabsf(i - roundf(i)) < 0.01f)
+        if (fabsf(i - floor(i + 0.5f)) < 0.01f)
         {
             coarseCoords->push_back(osg::Vec3(i, -radius, 0.0f));
             coarseCoords->push_back(osg::Vec3(i, radius, 0.0f));

src/ui/map3D/Q3DWidget.h

@@ -33,7 +33,7 @@ This file is part of the QGROUNDCONTROL project
 #define Q3DWIDGET_H
 
 #include <QtOpenGL>
-
+#include <inttypes.h>
 
 #include <osg/LineSegment>
 #include <osg/PositionAttitudeTransform>