diff options
| -rw-r--r-- | xmake.lua | 1 | ||||
| -rw-r--r-- | zencore/include/zencore/windows.h | 3 | ||||
| -rw-r--r-- | zencore/include/zencore/zencore.h | 3 |
3 files changed, 7 insertions, 0 deletions
@@ -45,6 +45,7 @@ if is_os("windows") then "UNICODE", "_CONSOLE", "NOMINMAX", -- stop Windows SDK defining 'min' and 'max' + "NOGDI", -- otherwise Windows.h defines 'GetObject' "WIN32_LEAN_AND_MEAN", -- cut down Windows.h "_WIN32_WINNT=0x0A00" ) diff --git a/zencore/include/zencore/windows.h b/zencore/include/zencore/windows.h index 417d473e0..4149506e7 100644 --- a/zencore/include/zencore/windows.h +++ b/zencore/include/zencore/windows.h @@ -10,6 +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 +#ifndef NOGDI +# define NOGDI // We don't want your GetObject define +#endif #ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h index 345468d55..1092b3a89 100644 --- a/zencore/include/zencore/zencore.h +++ b/zencore/include/zencore/zencore.h @@ -33,6 +33,9 @@ # if !defined(NOMINMAX) # define NOMINMAX // stops Windows.h from defining 'min/max' macros # endif +# if !defined(NOGDI) +# define NOGDI +# endif # if !defined(WIN32_LEAN_AND_MEAN) # define WIN32_LEAN_AND_MEAN // cut-down what Windows.h defines # endif |