diff options
| author | Martin Ridgers <[email protected]> | 2021-10-25 22:38:47 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-25 22:50:44 +0200 |
| commit | b5012d203fc1e2a5ed93221035a1045cac6415f6 (patch) | |
| tree | 26cbcd3a7937df0f53b1e2b8ced1a599a8413485 | |
| parent | Missing include for std::min/max (diff) | |
| download | zen-b5012d203fc1e2a5ed93221035a1045cac6415f6.tar.xz zen-b5012d203fc1e2a5ed93221035a1045cac6415f6.zip | |
Define NOMINMAX and WIN32_MEAN_AND_LEAN via xmake.lua too
| -rw-r--r-- | xmake.lua | 2 | ||||
| -rw-r--r-- | zencore/include/zencore/windows.h | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -44,6 +44,8 @@ if is_os("windows") then "_UNICODE", "UNICODE", "_CONSOLE", + "NOMINMAX", -- stop Windows SDK defining 'min' and 'max' + "WIN32_LEAN_AND_MEAN", -- cut down Windows.h "_WIN32_WINNT=0x0A00" ) -- add_ldflags("/MAP") diff --git a/zencore/include/zencore/windows.h b/zencore/include/zencore/windows.h index 68138566b..417d473e0 100644 --- a/zencore/include/zencore/windows.h +++ b/zencore/include/zencore/windows.h @@ -10,7 +10,9 @@ struct IUnknown; // Workaround for "combaseapi.h(229): error C2187: syntax erro #ifndef NOMINMAX # define NOMINMAX // We don't want your min/max macros #endif -#define WIN32_LEAN_AND_MEAN +#ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +#endif #include <windows.h> #undef GetObject |