Commit 350420df authored by Jan Möbius's avatar Jan Möbius

Fixed architecture detection. Hopefully fixes the UNKNOWN_OS Problem when...

Fixed architecture detection. Hopefully fixes the UNKNOWN_OS Problem when qmake forgets that its on a Macvi qmake/architecture.include 

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5511 383ad7c9-94d9-4d36-a494-682f7c89f535
parent c66138ac
...@@ -48,12 +48,13 @@ unix { ...@@ -48,12 +48,13 @@ unix {
OPERATING_SYSTEM = SuSE OPERATING_SYSTEM = SuSE
} }
macx {
TEST_DARWIN = $$system(uname -s)
contains( TEST_DARWIN, Darwin) {
OPERATING_SYSTEM = Darwin OPERATING_SYSTEM = Darwin
DEFINES += ARCH_DARWIN DEFINES += ARCH_DARWIN
export(DEFINES) SYSTEMTYPE = Darwin
export(DEFINES)
} else {
SYSTEMTYPE = Linux
} }
HARDWARE_PLATFORM = $$system(uname -a) HARDWARE_PLATFORM = $$system(uname -a)
...@@ -64,12 +65,6 @@ unix { ...@@ -64,12 +65,6 @@ unix {
# 32-bit Linux # 32-bit Linux
ARCHITECTURE = 32 ARCHITECTURE = 32
} }
contains(TEST_DARWIN, Darwin) {
SYSTEMTYPE = Darwin
} else {
SYSTEMTYPE = Linux
}
} }
win32 { win32 {
......
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