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

Add P3D 64 bit SDK build version config

Browse Source
This commit is contained in:
Roland Winklmeier
2018-10-02 15:24:40 +02:00
committed by Klaus Basan
parent ebe23a694b
commit b140e0e193
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/libraries.pri
View File

@@ -28,10 +28,10 @@ fsuipc {
simconnect { simconnect {
DEFINES += SIMCONNECT_H_NOMANIFEST DEFINES += SIMCONNECT_H_NOMANIFEST
equals(WORD_SIZE,64) { equals(WORD_SIZE,64) {
INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v4.2 P3D_X64_VERSION = "4.2"
LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v4.2 INCLUDEPATH *= $$EXTERNALSROOT/common/include/simconnect/P3D-v$${P3D_X64_VERSION}
LIBS *= -L$$EXTERNALS_LIB_DIR/P3D-v$${P3D_X64_VERSION}
LIBS *= -lAdvapi32 LIBS *= -lAdvapi32
LIBS += -ldxguid -lole32 LIBS += -ldxguid -lole32
# ole32 only needed for P3D on WIN64 systems, LNK2019: unresolved external symbol __imp_CoTaskMemFree referenced in function # ole32 only needed for P3D on WIN64 systems, LNK2019: unresolved external symbol __imp_CoTaskMemFree referenced in function

3
src/blackconfig/buildconfig.h
View File

@@ -147,6 +147,9 @@ namespace BlackConfig
//! \returns 32, 64 or -1 (in case no info is possible) //! \returns 32, 64 or -1 (in case no info is possible)
static int buildWordSize(); static int buildWordSize();
//! P3D 64 bit build version
static const QString &p3dX64BuildVersion(); // defined in buildconfig_gen.cpp.in
private: private:
//! Major version //! Major version
static int versionMajor(); // defined in buildconfig_gen.cpp.in static int versionMajor(); // defined in buildconfig_gen.cpp.in

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

@@ -141,6 +141,12 @@ const QString &BlackConfig::CBuildConfig::gitHeadSha1()
return gitHeadSha1; return gitHeadSha1;
} }
const QString &BlackConfig::CBuildConfig::p3dX64BuildVersion()
{
static const QString p3dX64BuildVersion(\"$$P3D_X64_VERSION\"); // libraries.pri
return p3dX64BuildVersion;
}
namespace Private namespace Private
{ {
const QDateTime lastCommitTimestampImpl() const QDateTime lastCommitTimestampImpl()