From b140e0e193d812a8096034228230237f215c0e49 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Tue, 2 Oct 2018 15:24:40 +0200
Subject: [PATCH] Add P3D 64 bit SDK build version config

---
 mkspecs/features/libraries.pri         | 6 +++---
 src/blackconfig/buildconfig.h          | 3 +++
 src/blackconfig/buildconfig_gen.cpp.in | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mkspecs/features/libraries.pri b/mkspecs/features/libraries.pri
index 2593bbc25..592336307 100644
--- a/mkspecs/features/libraries.pri
+++ b/mkspecs/features/libraries.pri
@@ -28,10 +28,10 @@ fsuipc {
 
 simconnect {
     DEFINES += SIMCONNECT_H_NOMANIFEST
-
     equals(WORD_SIZE,64) {
-        INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.2
-        LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.2
+        P3D_X64_VERSION = "4.2"
+        INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v$${P3D_X64_VERSION}
+        LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v$${P3D_X64_VERSION}
         LIBS *= -lAdvapi32
         LIBS += -ldxguid -lole32
         # ole32 only needed for P3D on WIN64 systems, LNK2019: unresolved external symbol __imp_CoTaskMemFree referenced in function
diff --git a/src/blackconfig/buildconfig.h b/src/blackconfig/buildconfig.h
index 01ad3c9c9..71156995a 100644
--- a/src/blackconfig/buildconfig.h
+++ b/src/blackconfig/buildconfig.h
@@ -147,6 +147,9 @@ namespace BlackConfig
         //! \returns 32, 64 or -1 (in case no info is possible)
         static int buildWordSize();
 
+        //! P3D 64 bit build version
+        static const QString &p3dX64BuildVersion(); // defined in buildconfig_gen.cpp.in
+
     private:
         //! Major version
         static int versionMajor(); // defined in buildconfig_gen.cpp.in
diff --git a/src/blackconfig/buildconfig_gen.cpp.in b/src/blackconfig/buildconfig_gen.cpp.in
index be8af07c7..8e4788798 100644
--- a/src/blackconfig/buildconfig_gen.cpp.in
+++ b/src/blackconfig/buildconfig_gen.cpp.in
@@ -141,6 +141,12 @@ const QString &BlackConfig::CBuildConfig::gitHeadSha1()
     return gitHeadSha1;
 }
 
+const QString &BlackConfig::CBuildConfig::p3dX64BuildVersion()
+{
+    static const QString p3dX64BuildVersion(\"$$P3D_X64_VERSION\"); // libraries.pri
+    return p3dX64BuildVersion;
+}
+
 namespace Private
 {
     const QDateTime lastCommitTimestampImpl()