Skip to content

Q
qgroundcontrol
Commit f16a6a00 authored by Hugo Vincent's avatar Hugo Vincent
Browse files
Options

Lorenz, try this 64-bit detection method please :-)

parent 3d2866df
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 12 deletions
mavground.pri
View file @ f16a6a00
...@@ -60,19 +60,14 @@ message(Qt version $$[QT_VERSION]) ...@@ -60,19 +60,14 @@ message(Qt version $$[QT_VERSION])
# MAC OS X # MAC OS X
macx { macx {
CONFIG += x86 #x86_64 message(Building for Mac OS X)
CONFIG -= static phonon config -= static
HARDWARE_PLATFORM = $$system(uname -a) HARDWARE_PLATFORM = $$system(g++ -dumpspecs)
contains( HARDWARE_PLATFORM, x86_64 ) { contains( HARDWARE_PLATFORM, m64 ) {
# x64 Mac OS X Snow Leopard 10.6 and later message(Building as 64-bit)
CONFIG += x86_64 CONFIG += x86_64
CONFIG -= x86 static phonon CONFIG -= x86
message(Building for Mac OS X 64bit/Snow Leopard 10.6 and later)
} else {
# x86 Mac OS X Leopard 10.5 and earlier
CONFIG += x86 static phonon
message(Building for Mac OS X 32bit/Leopard 10.5 and earlier)
} }
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
...@@ -108,7 +103,7 @@ linux-g++ { ...@@ -108,7 +103,7 @@ linux-g++ {
} }
INCLUDEPATH += /usr/include/SDL INCLUDEPATH += /usr/include/SDL
HARDWARE_PLATFORM = $$system(uname -a) HARDWARE_PLATFORM = $$system(uname -p)
contains( HARDWARE_PLATFORM, x86_64 ) { contains( HARDWARE_PLATFORM, x86_64 ) {
# 64-bit Linux # 64-bit Linux
LIBS += \ LIBS += \
......
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