[MinGW] Fix many unresolved symbols

This commit is contained in:
Roland Rossgotterer
2019-09-03 21:11:33 +02:00
committed by Mat Sutcliffe
parent 9bd2d294a3
commit e0b52db77a
6 changed files with 14 additions and 16 deletions

View File

@@ -7,6 +7,7 @@
*/ */
#include "xswiftbussettings.h" #include "xswiftbussettings.h"
#include "xswiftbussettingsqtfree.hpp"
namespace BlackMisc namespace BlackMisc
{ {

View File

@@ -10,7 +10,9 @@
#define BLACKMISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H #define BLACKMISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
#include "blackmisc/simulation/xplane/qtfreeutils.h" #include "blackmisc/simulation/xplane/qtfreeutils.h"
#include <string> #include <string>
#include <chrono>
namespace BlackMisc namespace BlackMisc
{ {
@@ -26,10 +28,10 @@ namespace BlackMisc
{ {
protected: protected:
//! Constructor. //! Constructor.
CXSwiftBusSettingsQtFree(); CXSwiftBusSettingsQtFree() {}
//! Destructor. //! Destructor.
~CXSwiftBusSettingsQtFree() = default; virtual ~CXSwiftBusSettingsQtFree() {}
public: public:
//! DBus server //! DBus server
@@ -132,7 +134,12 @@ namespace BlackMisc
int update(const CXSwiftBusSettingsQtFree &newValues); int update(const CXSwiftBusSettingsQtFree &newValues);
//! Sets timestamp to now //! Sets timestamp to now
virtual void setCurrentUtcTime(); virtual void setCurrentUtcTime()
{
using namespace std::chrono;
const milliseconds ms = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
m_msSinceEpochQtFree = static_cast<int64_t>(ms.count());
}
protected: protected:
//! The JSON members @{ //! The JSON members @{

View File

@@ -37,9 +37,6 @@ namespace BlackMisc
{ {
namespace Settings namespace Settings
{ {
CXSwiftBusSettingsQtFree::CXSwiftBusSettingsQtFree()
{}
bool CXSwiftBusSettingsQtFree::parseXSwiftBusString(const std::string &json) bool CXSwiftBusSettingsQtFree::parseXSwiftBusString(const std::string &json)
{ {
if (json.empty()) { return false; } if (json.empty()) { return false; }
@@ -152,12 +149,6 @@ namespace BlackMisc
return changed; return changed;
} }
void CXSwiftBusSettingsQtFree::setCurrentUtcTime()
{
using namespace std::chrono;
const milliseconds ms = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
m_msSinceEpochQtFree = static_cast<int64_t>(ms.count());
}
} // ns } // ns
} // ns } // ns
} // ns } // ns

View File

@@ -15,6 +15,7 @@
#include "blackmisc/simulation/aircraftmodel.h" #include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/simulation/simulatedaircraft.h" #include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.hpp"
#include "blackmisc/weather/cloudlayer.h" #include "blackmisc/weather/cloudlayer.h"
#include "blackmisc/weather/cloudlayerlist.h" #include "blackmisc/weather/cloudlayerlist.h"
#include "blackmisc/weather/gridpoint.h" #include "blackmisc/weather/gridpoint.h"

View File

@@ -6,10 +6,7 @@
* or distributed except according to the terms contained in the LICENSE file. * or distributed except according to the terms contained in the LICENSE file.
*/ */
// include whole code in this translation unit, as this code is used on swift/and XSWiftBus side #include "blackmisc/simulation/settings/xswiftbussettingsqtfree.hpp"
// BLACKMISC_EXPORT cannot be used
#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.cpp"
#include "settings.h" #include "settings.h"
#include <string> #include <string>

View File

@@ -12,6 +12,7 @@
#include "blackmisc/simulation/xplane/qtfreeutils.h" #include "blackmisc/simulation/xplane/qtfreeutils.h"
#include "blackmisc/simulation/settings/xswiftbussettings.h" #include "blackmisc/simulation/settings/xswiftbussettings.h"
#include "blackmisc/simulation/settings/xswiftbussettingsqtfree.hpp"
#include "blackmisc/directoryutils.h" #include "blackmisc/directoryutils.h"
#include "test.h" #include "test.h"