flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-19 03:45:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackconfig/buildconfig_gen.cpp.in
View File

@@ -13,20 +13,20 @@
const QDateTime &BlackConfig::CBuildConfig::getEol()
{
static const QString eol(\"$$BLACK_EOL\"); // config.pri
static const QString eol(\"$$swiftConfig(endOfLife)\"); // config.pri
static const QDateTime dt(eol.isEmpty() ? QDateTime() : QDateTime::fromString(eol, \"yyyyMMdd\"));
return dt;
}
int BlackConfig::CBuildConfig::vatsimClientId()
{
static const int id { $$VATSIM_CLIENT_ID };
static const int id { $$swiftConfig(vatsim.id) };
return id;
}
const QString &BlackConfig::CBuildConfig::vatsimPrivateKey()
{
static const auto pk = QString { \"$$VATSIM_CLIENT_PRIVATE_KEY\" };
static const auto pk = QString { \"$$swiftConfig(vatsim.key)\" };
return pk;
}