Unity build fails with MinGW

2018-10-14 14:39:28 +02:00 · 2018-10-14 14:39:28 +02:00 · a279c60aa8
parent 8231b40dd7
commit a279c60aa8
2 changed files with 5 additions and 1 deletions
--- a/include/TGUI/Widgets/MessageBox.hpp
+++ b/include/TGUI/Widgets/MessageBox.hpp
@ -32,6 +32,8 @@
 #include <TGUI/Widgets/ChildWindow.hpp>
 #include <TGUI/Renderers/MessageBoxRenderer.hpp>

+#undef MessageBox  // Windows.h defines MessageBox when NOMB isn't defined before including Windows.h
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

 namespace tgui
--- a/src/TGUI/Gui.cpp
+++ b/src/TGUI/Gui.cpp
@ -32,8 +32,10 @@
 #include <cassert>

 #ifdef SFML_SYSTEM_WINDOWS
+    #ifndef NOMINMAX // MinGW already defines this which causes a warning without this check
+        #define NOMINMAX
+    #endif
    #define NOMB
-    #define NOMINMAX
    #define VC_EXTRALEAN
    #define WIN32_LEAN_AND_MEAN
    #include <Windows.h>