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

Ref T118, for x64 P3D do not show SimConnect dll details

Browse Source
This commit is contained in:
Klaus Basan
2017-10-27 03:28:12 +02:00
parent 9d66062f05
commit f252f7542d
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/simulator/fsxcommon/fsxcommon.pro
View File

@@ -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

15
src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp
View File

@@ -15,12 +15,14 @@
#include "blackmisc/network/networkutils.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"
#include "blackmisc/logmessage.h"
#include "blackconfig/buildconfig.h"
#include <QFileInfo>
#include <QDesktopServices>
#include <QMessageBox>
#include <QStringBuilder>
#include <QDir>
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

2
src/plugins/simulator/fsxconfig/fsxconfig.pro
View File

@@ -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

2
src/plugins/simulator/p3dconfig/p3dconfig.pro
View File

@@ -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