mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-13 07:35:41 +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:
@@ -13,7 +13,10 @@
|
||||
#include "blackcore/keyboard.h"
|
||||
#include "blackmisc/hwkeyboardkey.h"
|
||||
#include <QHash>
|
||||
#include <Windows.h>
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
#include <windows.h>
|
||||
|
||||
namespace BlackCore
|
||||
{
|
||||
|
||||
@@ -5,6 +5,10 @@
|
||||
|
||||
#include "keymapping_windows.h"
|
||||
#include <QDebug>
|
||||
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
#include <windows.h>
|
||||
|
||||
using namespace BlackMisc::Hardware;
|
||||
|
||||
@@ -8,6 +8,9 @@
|
||||
#define BLACKCORE_KEYMAPPING_WINDOWS_H
|
||||
|
||||
#include "blackmisc/hwkeyboardkey.h"
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
#include <windows.h>
|
||||
|
||||
namespace BlackCore
|
||||
@@ -39,4 +42,4 @@ namespace BlackCore
|
||||
};
|
||||
|
||||
} // namespace BlackCore
|
||||
#endif // BLACKCORE_KEYMAPPING_WINDOWS_H
|
||||
#endif // guard
|
||||
|
||||
Reference in New Issue
Block a user