From f252f7542daa842bfb089bd8548116c3815cfb32 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 27 Oct 2017 03:28:12 +0200 Subject: [PATCH] Ref T118, for x64 P3D do not show SimConnect dll details --- src/plugins/simulator/fsxcommon/fsxcommon.pro | 2 +- .../fsxcommon/simconnectsettingscomponent.cpp | 15 ++++++++++++--- src/plugins/simulator/fsxconfig/fsxconfig.pro | 2 +- src/plugins/simulator/p3dconfig/p3dconfig.pro | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/plugins/simulator/fsxcommon/fsxcommon.pro b/src/plugins/simulator/fsxcommon/fsxcommon.pro index 9e5f7b3ee..fbf0d9d09 100644 --- a/src/plugins/simulator/fsxcommon/fsxcommon.pro +++ b/src/plugins/simulator/fsxcommon/fsxcommon.pro @@ -6,7 +6,7 @@ TARGET = simulatorfsxcommon TEMPLATE = lib CONFIG += staticlib -CONFIG += blackmisc blackcore blackgui +CONFIG += blackconfig blackmisc blackcore blackgui DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp index 0b58376be..a43a0457b 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp @@ -15,12 +15,14 @@ #include "blackmisc/network/networkutils.h" #include "blackmisc/simulation/fsx/simconnectutilities.h" #include "blackmisc/logmessage.h" +#include "blackconfig/buildconfig.h" #include #include #include #include #include +using namespace BlackConfig; using namespace BlackMisc; using namespace BlackMisc::Simulation::Fsx; using namespace BlackMisc::Network; @@ -110,7 +112,7 @@ namespace BlackSimPlugin QMessageBox::warning(qApp->activeWindow(), tr("Connection invalid"), tr("Invalid port!")); return; } - int p = port.toInt(); + const int p = port.toInt(); QString msg; if (!CNetworkUtils::canConnect(address, p, msg)) { @@ -175,8 +177,15 @@ namespace BlackSimPlugin void CSimConnectSettingsComponent::setSimConnectInfo() { - const CWinDllUtils::DLLInfo simConnectInfo = CSimConnectUtilities::simConnectDllInfo(); - ui->lbl_SimConnectInfo->setText(simConnectInfo.summary()); + if (CBuildConfig::isCompiledWithP3DSupport() && CBuildConfig::buildWordSize() == 64) + { + ui->lbl_SimConnectInfo->setText("Static linking P3Dv4 x64"); + } + else + { + const CWinDllUtils::DLLInfo simConnectInfo = CSimConnectUtilities::simConnectDllInfo(); + ui->lbl_SimConnectInfo->setText(simConnectInfo.summary()); + } this->checkSimConnectCfgFile(); } } // ns diff --git a/src/plugins/simulator/fsxconfig/fsxconfig.pro b/src/plugins/simulator/fsxconfig/fsxconfig.pro index db425a1cb..f3514ed35 100644 --- a/src/plugins/simulator/fsxconfig/fsxconfig.pro +++ b/src/plugins/simulator/fsxconfig/fsxconfig.pro @@ -5,7 +5,7 @@ QT += core widgets dbus network TARGET = simulatorfsxconfig TEMPLATE = lib CONFIG += plugin shared -CONFIG += blackmisc blackcore blackgui +CONFIG += blackconfig blackmisc blackcore blackgui DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src diff --git a/src/plugins/simulator/p3dconfig/p3dconfig.pro b/src/plugins/simulator/p3dconfig/p3dconfig.pro index 58e15e039..d87bc5203 100644 --- a/src/plugins/simulator/p3dconfig/p3dconfig.pro +++ b/src/plugins/simulator/p3dconfig/p3dconfig.pro @@ -5,7 +5,7 @@ QT += core widgets dbus network TARGET = simulatorp3dconfig TEMPLATE = lib CONFIG += plugin shared -CONFIG += blackmisc blackcore blackgui +CONFIG += blackconfig blackmisc blackcore blackgui DEPENDPATH += . $$SourceRoot/src INCLUDEPATH += . $$SourceRoot/src