refs #461 Unify FS9/FSX platform conditions.

This commit is contained in:
Mathew Sutcliffe
2015-11-23 20:46:53 +00:00
parent de87399080
commit d32f211a71
2 changed files with 11 additions and 13 deletions

View File

@@ -75,10 +75,10 @@ win32-msvc*: QMAKE_CXXFLAGS *= /bigobj
win32-g++: QMAKE_CXXFLAGS_DEBUG += -Og win32-g++: QMAKE_CXXFLAGS_DEBUG += -Og
################################ ################################
# No FSX or FS9 for 64 bit # FSX or FS9 on 32bit Windows only
################################ ################################
equals(WORD_SIZE,64): BLACK_CONFIG -= FSX FS9 equals(WORD_SIZE,64)|!win32: BLACK_CONFIG -= FSX FS9
################################ ################################
# Suppress stupid warnings # Suppress stupid warnings

View File

@@ -3,18 +3,16 @@ load(common_pre)
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
win32 { if (contains(BLACK_CONFIG, FSX) | contains(BLACK_CONFIG, FS9)) {
if (contains(BLACK_CONFIG, FSX) | contains(BLACK_CONFIG, FS9)) { SUBDIRS += fscommon
SUBDIRS += fscommon }
}
contains(BLACK_CONFIG, FSX) { contains(BLACK_CONFIG, FSX) {
SUBDIRS += fsx SUBDIRS += fsx
SUBDIRS += fsxconfig SUBDIRS += fsxconfig
} }
contains(BLACK_CONFIG, FS9) { contains(BLACK_CONFIG, FS9) {
SUBDIRS += fs9 SUBDIRS += fs9
}
} }
contains(BLACK_CONFIG, XPlane) { contains(BLACK_CONFIG, XPlane) {