Replace qmake variable BLACK_CONFIG with a system based on json files.

The config is loaded from json files by qmake, and we define the qmake
function `swiftConfig` for checking whether a feature is enabled.
This function can be directly used in `buildconfig_gen.cpp.in`,
so the trick with C++ comment tokens in variables is not needed.
This commit is contained in:
Mat Sutcliffe
2018-11-04 17:13:27 +00:00
parent 188d3d914e
commit 82679a3010
25 changed files with 232 additions and 160 deletions

View File

@@ -7,26 +7,26 @@ SUBDIRS += plugincommon
SUBDIRS += emulated
SUBDIRS += emulatedconfig
contains(BLACK_CONFIG,FSX|FS9|P3D) {
swiftConfig(sims.fsx)|swiftConfig(sims.fs9)|swiftConfig(sims.p3d) {
SUBDIRS += fsuipc32
SUBDIRS += fsuipc64
SUBDIRS += fscommon
}
contains(BLACK_CONFIG,FSX|P3D) {
swiftConfig(sims.fsx)|swiftConfig(sims.p3d) {
SUBDIRS += fsxcommon
}
contains(BLACK_CONFIG,P3D) {
swiftConfig(sims.p3d) {
SUBDIRS += p3d
SUBDIRS += p3dconfig
}
contains(BLACK_CONFIG,FSX) {
swiftConfig(sims.fsx) {
SUBDIRS += fsx
SUBDIRS += fsxconfig
}
contains(BLACK_CONFIG,FS9):contains(BLACK_CONFIG,FSUIPC) {
swiftConfig(sims.fs9):swiftConfig(sims.fsuipc) {
SUBDIRS += fs9
}
contains(BLACK_CONFIG,XPlane) {
swiftConfig(sims.xplane) {
SUBDIRS += xplane
SUBDIRS += xplaneconfig
}