From 76bf774485d7da4285a9af3b9605b558465af50e Mon Sep 17 00:00:00 2001 From: cc9cii Date: Fri, 6 Jun 2014 03:52:41 +1000 Subject: [PATCH] Small changes for compiling with MSVC 2013. --- extern/oics/ICSPrerequisites.h | 4 ++++ extern/sdl4ogre/sdlinputwrapper.hpp | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/extern/oics/ICSPrerequisites.h b/extern/oics/ICSPrerequisites.h index 52daea3f4..5fe58a63d 100644 --- a/extern/oics/ICSPrerequisites.h +++ b/extern/oics/ICSPrerequisites.h @@ -37,6 +37,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include +#if defined(_WIN32) && _MSC_VER >= 1800 +#include /* std::min and std::max */ +#endif + #include "tinyxml.h" #include "SDL_keyboard.h" diff --git a/extern/sdl4ogre/sdlinputwrapper.hpp b/extern/sdl4ogre/sdlinputwrapper.hpp index f08e3eff6..e4c97066d 100644 --- a/extern/sdl4ogre/sdlinputwrapper.hpp +++ b/extern/sdl4ogre/sdlinputwrapper.hpp @@ -1,6 +1,11 @@ #ifndef SDL4OGRE_SDLINPUTWRAPPER_H #define SDL4OGRE_SDLINPUTWRAPPER_H +#if defined(_WIN32) && _MSC_VER >= 1800 +#include +#define NOMINMAX +#endif + #include #include