mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-07 02:35:33 +08:00
refs #207, fixed windows.h / NOMINMAX.
Depending on the build setup (config.pri) missing NOMINMAX caused warning, or already existing NOMINMAX caused warning
This commit is contained in:
@@ -6,6 +6,9 @@
|
||||
#ifndef BLACKSIMPLUGIN_FSX_SIMCONNECT_DATADEFINITION_H
|
||||
#define BLACKSIMPLUGIN_FSX_SIMCONNECT_DATADEFINITION_H
|
||||
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
#include <windows.h>
|
||||
|
||||
namespace BlackSimPlugin
|
||||
|
||||
@@ -8,7 +8,10 @@
|
||||
// though it does not make sense to be used on non WIN machines.
|
||||
// But it allows parts as GUI to comile
|
||||
#ifdef Q_OS_WIN
|
||||
#include <windows.h>
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
#include <Windows.h>
|
||||
#else
|
||||
typedef unsigned long DWORD;
|
||||
#endif
|
||||
|
||||
@@ -6,18 +6,19 @@
|
||||
#ifndef BLACKSIMPLUGIN_SIMULATOR_FSX_H
|
||||
#define BLACKSIMPLUGIN_SIMULATOR_FSX_H
|
||||
|
||||
#define NOMINMAX
|
||||
|
||||
#include "simconnect_datadefinition.h"
|
||||
|
||||
#include "blackcore/simulator.h"
|
||||
#include "blackcore/interpolator_linear.h"
|
||||
#include "blackmisc/avaircraft.h"
|
||||
#include "blacksim/simulatorinfo.h"
|
||||
#include <simconnect/SimConnect.h>
|
||||
#include <QObject>
|
||||
#include <QtPlugin>
|
||||
#include <QHash>
|
||||
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
#include <windows.h>
|
||||
|
||||
namespace BlackSimPlugin
|
||||
|
||||
Reference in New Issue
Block a user