Don't try to compile FSX driver for 64 bits.

This requires moving the config DEFINES into build.pri,
because projects include build.pri after config.pri,
and build.pri detects the WORD_SIZE.
This commit is contained in:
Mathew Sutcliffe
2014-06-17 19:44:34 +01:00
parent 976de540e8
commit fed270c068
3 changed files with 19 additions and 12 deletions

View File

@@ -69,3 +69,21 @@ macx-clang {
# TODO # TODO
WORD_SIZE = 64 WORD_SIZE = 64
} }
###########################
# No FSX for 64 bits
###########################
equals(WORD_SIZE,64): BLACK_CONFIG -= FSX
################################
# Defines for conditional compilation
################################
contains(BLACK_CONFIG, BlackSound) { DEFINES += WITH_BLACKSOUND }
contains(BLACK_CONFIG, BlackInput) { DEFINES += WITH_BLACKINPUT }
contains(BLACK_CONFIG, BlackSim) { DEFINES += WITH_BLACKSIM }
contains(BLACK_CONFIG, BlackCore) { DEFINES += WITH_BLACKCORE }
contains(BLACK_CONFIG, BlackGui) { DEFINES += WITH_BLACKGUI }
contains(BLACK_CONFIG, FSX) { DEFINES += WITH_FSX }
contains(BLACK_CONFIG, XPlane) { DEFINES += WITH_XPLANE }

View File

@@ -1,4 +1,5 @@
include (config.pri) include (config.pri)
include (build.pri)
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered

View File

@@ -30,15 +30,3 @@ BLACK_CONFIG += Unittests
BLACK_CONFIG += FSX BLACK_CONFIG += FSX
#BLACK_CONFIG += XPlane #BLACK_CONFIG += XPlane
#BLACK_CONFIG += Doxygen #BLACK_CONFIG += Doxygen
################################
# Defines, for compile time code
################################
contains(BLACK_CONFIG, BlackSound) { DEFINES += WITH_BLACKSOUND }
contains(BLACK_CONFIG, BlackInput) { DEFINES += WITH_BLACKINPUT }
contains(BLACK_CONFIG, BlackSim) { DEFINES += WITH_BLACKSIM }
contains(BLACK_CONFIG, BlackCore) { DEFINES += WITH_BLACKCORE }
contains(BLACK_CONFIG, BlackGui) { DEFINES += WITH_BLACKGUI }
contains(BLACK_CONFIG, FSX) { DEFINES += WITH_FSX }
contains(BLACK_CONFIG, XPlane) { DEFINES += WITH_XPLANE }