Integrate swift version numbering into the json config system.

This commit is contained in:
Mat Sutcliffe
2018-11-04 18:59:06 +00:00
parent 82679a3010
commit 307e170d5f
7 changed files with 34 additions and 48 deletions

View File

@@ -101,6 +101,6 @@ constexpr bool BlackConfig::CBuildConfig::isVatsimVersion()
!!ENDIF
}
constexpr int BlackConfig::CBuildConfig::versionMajor() { return $$BLACK_VER_MAJ; }
constexpr int BlackConfig::CBuildConfig::versionMinor() { return $$BLACK_VER_MIN; }
constexpr int BlackConfig::CBuildConfig::versionMicro() { return $$BLACK_VER_MIC; }
constexpr int BlackConfig::CBuildConfig::versionMajor() { return $$swiftConfig(version.major); }
constexpr int BlackConfig::CBuildConfig::versionMinor() { return $$swiftConfig(version.minor); }
constexpr int BlackConfig::CBuildConfig::versionMicro() { return $$swiftConfig(version.micro); }

View File

@@ -72,7 +72,7 @@ DEFINES += XPLM210=1
DEFINES += XPMP_CLIENT_NAME=\\\"xswiftbus\\\"
DEFINES += XPMP_CLIENT_LONGNAME=\\\"xswiftbus\\\"
DEFINES += XSWIFTBUS_VERSION=\\\"$${BLACK_VERSION}\\\"
DEFINES += XSWIFTBUS_VERSION=\\\"$$swiftConfig(version.full)\\\"
# X-Plane plugins must follow a prescribed filename and directory structure.
TARGET_EXT = .xpl