Skip to content

Q
qgroundcontrol
Commit e889f908 authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Fixed 64/32bit OS detection on Mac OS issue

parent fdb6d419
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
qgroundcontrol.pri
View file @ e889f908
...@@ -37,7 +37,7 @@ win32-msvc2008|win32-msvc2010 { ...@@ -37,7 +37,7 @@ win32-msvc2008|win32-msvc2010 {
DEFINES += _TTY_NOWARN_ DEFINES += _TTY_NOWARN_
# MAC OS X # MAC OS X
macx-g++42 { macx|macx-g++42|macx-g++: {
# COMPILER_VERSION = $$system(gcc -v) # COMPILER_VERSION = $$system(gcc -v)
#message(Using compiler $$COMPILER_VERSION) #message(Using compiler $$COMPILER_VERSION)
......
qgroundcontrol.pro
View file @ e889f908
...@@ -180,10 +180,11 @@ INCLUDEPATH += . \ ...@@ -180,10 +180,11 @@ INCLUDEPATH += . \
include(thirdParty/qserialport/qgroundcontrol-qserialport.pri) include(thirdParty/qserialport/qgroundcontrol-qserialport.pri)
# Serial port detection (ripped-off from qextserialport library) # 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++::SOURCES += src/libs/qextserialport/qextserialenumerator_unix.cpp
linux-g++-64::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::SOURCES += src/libs/qextserialport/qextserialenumerator_win.cpp
win32-msvc2008|win32-msvc2010::SOURCES += src/libs/qextserialport/qextserialenumerator_win.cpp
# Input # Input
FORMS += src/ui/MainWindow.ui \ FORMS += src/ui/MainWindow.ui \
...@@ -355,7 +356,7 @@ HEADERS += src/MG.h \ ...@@ -355,7 +356,7 @@ HEADERS += src/MG.h \
src/ui/QGCRGBDView.h src/ui/QGCRGBDView.h
# Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler # 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) { contains(DEPENDENCIES_PRESENT, osg) {
message("Including headers for OpenSceneGraph") message("Including headers for OpenSceneGraph")
...@@ -483,7 +484,7 @@ SOURCES += src/main.cc \ ...@@ -483,7 +484,7 @@ SOURCES += src/main.cc \
src/ui/QGCRGBDView.cc src/ui/QGCRGBDView.cc
# Enable Google Earth only on Mac OS and Windows with Visual Studio compiler # 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 # Enable OSG only if it has been found
contains(DEPENDENCIES_PRESENT, osg) { contains(DEPENDENCIES_PRESENT, osg) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment