diff options
Diffstat (limited to 'tools/platform')
| -rw-r--r-- | tools/platform/gui.cpp | 4 | ||||
| -rw-r--r-- | tools/platform/windows/win-window.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/platform/gui.cpp b/tools/platform/gui.cpp index 8bfff2d11..a4602e4f2 100644 --- a/tools/platform/gui.cpp +++ b/tools/platform/gui.cpp @@ -353,5 +353,9 @@ GUI::~GUI() #include "external/imgui/imgui.cpp" #include "external/imgui/imgui_draw.cpp" #ifdef _WIN32 +// imgui_impl_win32 defines these, so make sure it doesn't error because +// they're already there +#undef WIN32_LEAN_AND_MEAN +#undef NOMINMAX #include "external/imgui/examples/imgui_impl_win32.cpp" #endif diff --git a/tools/platform/windows/win-window.cpp b/tools/platform/windows/win-window.cpp index f0217e04c..d785b0fb7 100644 --- a/tools/platform/windows/win-window.cpp +++ b/tools/platform/windows/win-window.cpp @@ -2,8 +2,7 @@ #include "../window.h" -#define WIN32_LEAN_AND_MEAN -#include <Windows.h> +#include <windows.h> #include <windowsx.h> using namespace Slang; |