diff --git a/src/plugins/simulator/fsx/simconnectwindows.h b/src/plugins/simulator/fsx/simconnectwindows.h new file mode 100644 index 000000000..5a1494785 --- /dev/null +++ b/src/plugins/simulator/fsx/simconnectwindows.h @@ -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 +#include + +#endif // guard diff --git a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h index e0e31e2ff..ef81628b9 100644 --- a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h +++ b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h @@ -14,12 +14,8 @@ #include -#ifndef NOMINMAX -#define NOMINMAX -#endif #include "blackmisc/aviation/aircraftlights.h" -#include -#include +#include "../fsx/simconnectwindows.h" #include #include diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h index 978e007dc..adf7dd70a 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h @@ -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 #include #include #include #include -#ifndef NOMINMAX -#define NOMINMAX -#endif -#include - namespace BlackSimPlugin { namespace FsxCommon