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:
Klaus Basan
2014-04-14 11:23:33 +02:00
parent e474671ead
commit 9db245c843
7 changed files with 24 additions and 7 deletions

View File

@@ -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
{

View File

@@ -5,6 +5,10 @@
#include "keymapping_windows.h"
#include <QDebug>
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
using namespace BlackMisc::Hardware;

View File

@@ -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