flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-28 20:25:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Link CBuildConfig and CVersion into static library blackconfig

Browse Source 
CBuildConfig including private keys etc. should not be part of a
public library API. Therefore link it into a static library, which
is not available to end users.

refs #645
This commit is contained in:
Roland Winklmeier
2016-05-24 13:12:23 +02:00
parent 26a78ac2a6
commit 2d8f56a598
40 changed files with 135 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/application.cpp
View File

@@ -7,6 +7,7 @@
* contained in the LICENSE file.
*/
#include "blackconfig/buildconfig.h"
#include "blackcore/application.h"
#include "blackcore/contextapplication.h"
#include "blackcore/cookiemanager.h"
@@ -15,7 +16,6 @@
#include "blackcore/registermetadata.h"
#include "blackcore/setupreader.h"
#include "blackcore/webdataservices.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/datacache.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/filelogger.h"
@@ -53,6 +53,7 @@
#include <QtGlobal>
#include <cstdlib>
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackMisc::Network;
using namespace BlackMisc::Aviation;

2
src/blackcore/blackcore.pro
View File

@@ -6,7 +6,7 @@ QT += network dbus xml multimedia
TARGET = blackcore
TEMPLATE = lib
CONFIG += blackmisc blackinput blacksound
CONFIG += blackconfig blackmisc blackinput blacksound
contains(BLACK_CONFIG, Static) {
CONFIG += staticlib

4
src/blackcore/contextsimulator.h
View File

@@ -23,13 +23,13 @@
//! @}
#include "blackconfig/buildconfig.h"
#include "blackcore/blackcoreexport.h"
#include "blackcore/context.h"
#include "blackcore/corefacade.h"
#include "blackcore/corefacadeconfig.h"
#include "blackcore/simulator.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/pixmap.h"
#include "blackmisc/pq/length.h"
#include "blackmisc/pq/time.h"
@@ -175,7 +175,7 @@ namespace BlackCore
virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const = 0;
//! Simulator avialable (driver available)?
bool isSimulatorAvailable() const { return BlackMisc::CBuildConfig::isCompiledWithFlightSimulatorSupport() && !getSimulatorPluginInfo().isUnspecified(); }
bool isSimulatorAvailable() const { return BlackConfig::CBuildConfig::isCompiledWithFlightSimulatorSupport() && !getSimulatorPluginInfo().isUnspecified(); }
//! Icon representing the model
virtual BlackMisc::CPixmap iconForModel(const QString &modelString) const = 0;

3
src/blackcore/data/globalsetup.cpp
View File

@@ -7,8 +7,8 @@
* contained in the LICENSE file.
*/
#include "blackconfig/buildconfig.h"
#include "blackcore/data/globalsetup.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/json.h"
#include "blackmisc/network/server.h"
#include "blackmisc/network/user.h"
@@ -17,6 +17,7 @@
#include <QJsonObject>
#include <QStringList>
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackMisc::Json;
using namespace BlackMisc::Network;

3
src/blackcore/data/updateinfo.cpp
View File

@@ -7,11 +7,12 @@
* contained in the LICENSE file.
*/
#include "blackconfig/buildconfig.h"
#include "blackcore/data/updateinfo.h"
#include "blackmisc/buildconfig.h"
#include <QStringList>
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackMisc::Network;

3
src/blackcore/networkvatlib.cpp
View File

@@ -9,6 +9,7 @@
//! \cond PRIVATE
#include "blackconfig/buildconfig.h"
#include "blackcore/application.h"
#include "blackcore/networkvatlib.h"
#include "blackmisc/aviation/aircraftsituation.h"
@@ -19,7 +20,6 @@
#include "blackmisc/aviation/informationmessage.h"
#include "blackmisc/aviation/livery.h"
#include "blackmisc/aviation/transponder.h"
#include "blackmisc/buildconfig.h"
#include "blackmisc/compare.h"
#include "blackmisc/geo/coordinategeodetic.h"
#include "blackmisc/geo/latitude.h"
@@ -60,6 +60,7 @@
static_assert(! std::is_abstract<BlackCore::CNetworkVatlib>::value, "Must implement all pure virtuals");
static_assert(VAT_LIBVATLIB_VERSION == 905, "Wrong vatlib header installed");
using namespace BlackConfig;
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo;