mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-04 08:36:52 +08:00
refs #396, move subproject BlackSim into BlackMisc::Simulation
* removed unused samples / tests * fixed found Doxygen issues * removed blacksimfreefunctions, now in BlackMisc::Simulation::registerMetadata() * samples_vetcor_geo to samples_geo
This commit is contained in:
committed by
Roland Winklmeier
parent
a6ca57265e
commit
32f60722c8
@@ -13,14 +13,14 @@
|
||||
// bug in FSUIPC_User.h, windows.h not included, so we have to import it first
|
||||
#include "FSUIPC/FSUIPC_User.h"
|
||||
|
||||
#include "blacksim/fscommon/bcdconversions.h"
|
||||
#include "blackmisc/simulation/fscommon/bcdconversions.h"
|
||||
#include "blackmisc/logmessage.h"
|
||||
#include <QDebug>
|
||||
#include <QLatin1Char>
|
||||
#include <QDateTime>
|
||||
|
||||
using namespace BlackMisc;
|
||||
using namespace BlackSim::FsCommon;
|
||||
using namespace BlackMisc::Simulation::FsCommon;
|
||||
using namespace BlackMisc::Aviation;
|
||||
using namespace BlackMisc::Network;
|
||||
using namespace BlackMisc::Geo;
|
||||
|
||||
@@ -21,10 +21,8 @@ SOURCES += *.cpp
|
||||
HEADERS += *.h
|
||||
|
||||
win32:!win32-g++*: PRE_TARGETDEPS += ../../../../lib/blackmisc.lib \
|
||||
../../../../lib/blacksim.lib \
|
||||
../../../../lib/blackcore.lib
|
||||
else: PRE_TARGETDEPS += ../../../../lib/libblackmisc.a \
|
||||
../../../../lib/libblacksim.a \
|
||||
../../../../lib/libblackcore.a
|
||||
DESTDIR = ../../lib
|
||||
|
||||
|
||||
@@ -9,18 +9,17 @@
|
||||
|
||||
#include "simulator_fscommon.h"
|
||||
#include "blackmisc/logmessage.h"
|
||||
#include "blacksim/fscommon/vpilotmodelmappings.h"
|
||||
#include "blacksim/fscommon/fscommonutil.h"
|
||||
#include "blackmisc/simulation/fscommon/vpilotmodelmappings.h"
|
||||
#include "blackmisc/simulation/fscommon/fscommonutil.h"
|
||||
|
||||
using namespace BlackMisc::PhysicalQuantities;
|
||||
using namespace BlackMisc::Simulation;
|
||||
using namespace BlackSim::FsCommon;
|
||||
using namespace BlackMisc::Simulation::FsCommon;
|
||||
using namespace BlackMisc::Aviation;
|
||||
using namespace BlackMisc::Network;
|
||||
using namespace BlackMisc;
|
||||
using namespace BlackSimPlugin::FsCommon;
|
||||
using namespace BlackSim;
|
||||
using namespace BlackSim::FsCommon;
|
||||
using namespace BlackMisc::Simulation;
|
||||
using namespace BlackMisc::Simulation::FsCommon;
|
||||
|
||||
namespace BlackSimPlugin
|
||||
{
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "blackcore/simulator.h"
|
||||
#include "blackcore/interpolator.h"
|
||||
#include "blacksim/fscommon/aircraftmapper.h"
|
||||
#include "blackmisc/simulation/fscommon/aircraftmapper.h"
|
||||
#include "fsuipc.h"
|
||||
|
||||
#include <QObject>
|
||||
@@ -108,7 +108,7 @@ namespace BlackSimPlugin
|
||||
static void reverseLookupIcaoData(BlackMisc::Simulation::CAircraftModel &model);
|
||||
|
||||
//! Get the mapper singleton
|
||||
static BlackSim::FsCommon::CAircraftMapper *mapperInstance();
|
||||
static BlackMisc::Simulation::FsCommon::CAircraftMapper *mapperInstance();
|
||||
|
||||
protected slots:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user