Working towards full 64bit support

qgroundcontrol.pri

@@ -37,13 +37,13 @@ win32-msvc2008|win32-msvc2010 {
 DEFINES += _TTY_NOWARN_
 
 # MAC OS X
-macx {
+macx-g++42 {
 
    # COMPILER_VERSION = $$system(gcc -v)
     #message(Using compiler $$COMPILER_VERSION)
 
-        CONFIG += x86 cocoa phonon
+        CONFIG += x86_64 cocoa phonon
-        CONFIG -= x86_64
+        CONFIG -= x86
 
     #HARDWARE_PLATFORM = $$system(uname -a)
     #contains( $$HARDWARE_PLATFORM, "9.6.0" ) || contains( $$HARDWARE_PLATFORM, "9.7.0" ) || contains( $$HARDWARE_PLATFORM, "9.8.0" ) || contains( $$HARDWARE_PLATFORM, "9.9.0" ) {
@@ -93,7 +93,7 @@ macx {
     # Copy parameter tooltip files
     QMAKE_POST_LINK += && cp -rf $$BASEDIR/files $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
     # Copy libraries
-    QMAKE_POST_LINK += && cp -rf $$BASEDIR/lib/mac32-gcc40/lib/* $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
+    QMAKE_POST_LINK += && cp -rf $$BASEDIR/lib/mac64/lib/* $$TARGETDIR/qgroundcontrol.app/Contents/MacOS
     # Copy model files
     #QMAKE_POST_LINK += && cp -f $$BASEDIR/models/*.dae $$TARGETDIR/qgroundcontrol.app/Contents/MacOs
 
@@ -105,11 +105,11 @@ macx {
     # Include OpenSceneGraph libraries
     INCLUDEPATH += -framework GLUT \
             -framework Cocoa \
-            $$BASEDIR/lib/mac32-gcc40/include
+            $$BASEDIR/lib/mac64/include
 
     LIBS += -framework GLUT \
             -framework Cocoa \
-            -L$$BASEDIR/lib/mac32-gcc40/lib \
+            -L$$BASEDIR/lib/mac64/lib \
             -lOpenThreads \
             -losg \
             -losgViewer \

src/configuration.h

@@ -12,14 +12,14 @@
 #define WITH_TEXT_TO_SPEECH 1
 
 #define QGC_APPLICATION_NAME "QGroundControl"
-#define QGC_APPLICATION_VERSION "v. 1.0.0 (Alpha RC18)"
+#define QGC_APPLICATION_VERSION "v. 1.0.1 (Alpha RC18)"
 
 namespace QGC
 
 {
 const QString APPNAME = "QGROUNDCONTROL";
 const QString COMPANYNAME = "QGROUNDCONTROL";
-const int APPLICATIONVERSION = 100; // 1.0.0
+const int APPLICATIONVERSION = 101; // 1.0.1
 }
 
 #endif // QGC_CONFIGURATION_H

src/ui/map3D/Pixhawk3DWidget.cc

@@ -701,13 +701,17 @@ Pixhawk3DWidget::createGrid(void)
     osg::ref_ptr<osg::Vec3Array> coarseCoords(new osg::Vec3Array);
 
     // draw a 20m x 20m grid with 0.25m resolution
-    for (float i = -radius; i <= radius; i += resolution) {
+    for (float i = -radius; i <= radius; i += resolution)
-        if (fabsf(i - floor(i + 0.5f)) < 0.01f) {
+    {
+        if (fabs(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));
             coarseCoords->push_back(osg::Vec3(-radius, i, 0.0f));
             coarseCoords->push_back(osg::Vec3(radius, i, 0.0f));
-        } else {
+        }
+        else
+        {
             fineCoords->push_back(osg::Vec3(i, -radius, 0.0f));
             fineCoords->push_back(osg::Vec3(i, radius, 0.0f));
             fineCoords->push_back(osg::Vec3(-radius, i, 0.0f));