Ref T118, fix for simconnect.h not including windows.h

This commit is contained in:
Klaus Basan
2017-10-18 03:09:17 +02:00
parent 41f5999094
commit c6d184cd3b
3 changed files with 15 additions and 11 deletions

View File

@@ -0,0 +1,13 @@
// in P3Dv4 the simconnect.h does not include windows.h
// here we include windows.h first
#ifndef BLACKSIMPLUGIN_FSX_SIMCONNECTWINDOWS_H
#define BLACKSIMPLUGIN_FSX_SIMCONNECTWINDOWS_H
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#include <SimConnect.h>
#endif // guard

View File

@@ -14,12 +14,8 @@
#include <QtGlobal>
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include "blackmisc/aviation/aircraftlights.h"
#include <SimConnect.h>
#include <windows.h>
#include "../fsx/simconnectwindows.h"
#include <algorithm>
#include <QString>

View File

@@ -14,6 +14,7 @@
#include "simconnectdatadefinition.h"
#include "simconnectobject.h"
#include "../fsx/simconnectwindows.h"
#include "../fscommon/simulatorfscommon.h"
#include "blackcore/simulator.h"
#include "blackmisc/simulation/interpolatorlinear.h"
@@ -26,17 +27,11 @@
#include "blackmisc/network/client.h"
#include "blackmisc/pixmap.h"
#include <SimConnect.h>
#include <QObject>
#include <QtPlugin>
#include <QHash>
#include <QFutureWatcher>
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
namespace BlackSimPlugin
{
namespace FsxCommon