diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index c3270d3..a2b8db1 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -37,7 +37,7 @@ win32-msvc2008|win32-msvc2010 {
 DEFINES += _TTY_NOWARN_
 
 # MAC OS X
-macx-g++42 {
+macx|macx-g++42|macx-g++: {
 
    # COMPILER_VERSION = $$system(gcc -v)
     #message(Using compiler $$COMPILER_VERSION)
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 483dd50..db264b6 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -180,10 +180,11 @@ INCLUDEPATH += . \
 include(thirdParty/qserialport/qgroundcontrol-qserialport.pri)
 
 # Serial port detection (ripped-off from qextserialport library)
-macx::SOURCES += src/libs/qextserialport/qextserialenumerator_osx.cpp
+macx|macx-g++|macx-g++42::SOURCES += src/libs/qextserialport/qextserialenumerator_osx.cpp
 linux-g++::SOURCES += src/libs/qextserialport/qextserialenumerator_unix.cpp
 linux-g++-64::SOURCES += src/libs/qextserialport/qextserialenumerator_unix.cpp
 win32::SOURCES += src/libs/qextserialport/qextserialenumerator_win.cpp
+win32-msvc2008|win32-msvc2010::SOURCES += src/libs/qextserialport/qextserialenumerator_win.cpp
 
 # Input
 FORMS += src/ui/MainWindow.ui \
@@ -355,7 +356,7 @@ HEADERS += src/MG.h \
     src/ui/QGCRGBDView.h
 
 # Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler
-macx|win32-msvc2008|win32-msvc2010::HEADERS += src/ui/map3D/QGCGoogleEarthView.h
+macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010::HEADERS += src/ui/map3D/QGCGoogleEarthView.h
 contains(DEPENDENCIES_PRESENT, osg) { 
     message("Including headers for OpenSceneGraph")
     
@@ -483,7 +484,7 @@ SOURCES += src/main.cc \
     src/ui/QGCRGBDView.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
+macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
 
 # Enable OSG only if it has been found
 contains(DEPENDENCIES_PRESENT, osg) {