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

Introduce build config template buildconfig.h.in

Browse Source 
refs #625
This commit is contained in:
Roland Winklmeier
2016-03-31 17:12:01 +02:00
parent 4e9c34b04a
commit d379f14133
45 changed files with 279 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackcore/networkvatlib.cpp
View File

@@ -11,8 +11,9 @@
#include "networkvatlib.h"
#include "application.h"
#include "blackmisc/project.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/buildconfig.h"
#include <QJsonDocument>
#include <vector>
#include <type_traits>
@@ -20,14 +21,6 @@
static_assert(! std::is_abstract<BlackCore::CNetworkVatlib>::value, "Must implement all pure virtuals");
static_assert(VAT_LIBVATLIB_VERSION == 905, "Wrong vatlib header installed");
#if !defined(BLACK_CLIENT_PUBLIC_ID)
#error Missing definition of id
#endif
#if !defined(BLACK_CLIENT_PRIVATE_KEY)
#error Missing definition of pk
#endif
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;
@@ -71,11 +64,10 @@ namespace BlackCore
clientCapabilities |= vatCapsStealth;
}
static const QString pkDef(BLACK_STRINGIFY(BLACK_CLIENT_PRIVATE_KEY));
static const QByteArray pk(this->getCmdLineFsdKey().isEmpty() ? pkDef.toLocal8Bit() : this->getCmdLineFsdKey().toLocal8Bit());
static const QByteArray pk(this->getCmdLineFsdKey().isEmpty() ? CBuildConfig::vatsimPrivateKey().toLocal8Bit() : this->getCmdLineFsdKey().toLocal8Bit());
m_net.reset(Vat_CreateNetworkSession(vatServerLegacyFsd, sApp->swiftVersionChar(),
CProject::versionMajor(), CProject::versionMinor(),
"None", BLACK_CLIENT_PUBLIC_ID, pk.constData(),
CVersion::versionMajor(), CVersion::versionMinor(),
"None", CBuildConfig::vatsimClientId(), pk.constData(),
clientCapabilities));
Vat_SetStateChangeHandler(m_net.data(), onConnectionStatusChanged, this);
@@ -599,7 +591,7 @@ namespace BlackCore
};
// only in not officially shipped versions
return (CProject::isShippedVersion() && !CProject::isBetaTest()) ? e : opts;
return (CBuildConfig::isShippedVersion() && !CBuildConfig::isBetaTest()) ? e : opts;
}
QString CNetworkVatlib::getCmdLineFsdKey() const