From 6a2423f104b434b620d3240d11d8c7a42c745562 Mon Sep 17 00:00:00 2001 From: rude Date: Wed, 9 Mar 2011 11:01:40 +0100 Subject: [PATCH] windows.h #defines min/max by default, causing problems with std::[min, max]. --HG-- branch : minor --- src/common/config.h | 1 + src/modules/graphics/opengl/Font.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/config.h b/src/common/config.h index 510ee012c..fec797d6a 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -65,6 +65,7 @@ #if defined(LOVE_WINDOWS) # define LOVE_LEGENDARY_UTF8_ARGV_HACK # define LOVE_LEGENDARY_CONSOLE_IO_HACK +# define NOMINMAX #endif #endif // LOVE_CONFIG_H diff --git a/src/modules/graphics/opengl/Font.cpp b/src/modules/graphics/opengl/Font.cpp index feae49631..7577c342b 100644 --- a/src/modules/graphics/opengl/Font.cpp +++ b/src/modules/graphics/opengl/Font.cpp @@ -17,7 +17,7 @@ * misrepresented as being the original software. * 3. This notice may not be removed or altered from any source distribution. **/ - +#include #include "Font.h" #include #include "Quad.h"