Merge remote-tracking branch 'cc9cii/master'

apps/openmw/mwstate/charactermanager.cpp

@@ -3,6 +3,7 @@
 
 #include <sstream>
 #include <stdexcept>
+#include <cctype> // std::isalnum
 
 #include <boost/filesystem.hpp>
 

extern/oics/ICSPrerequisites.h

@@ -36,6 +36,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <map>
 #include <list>
 #include <limits>
+#include <algorithm> /* std::min and std::max for MSVC 2013 */
 
 #include "tinyxml.h"
 
@@ -90,7 +91,7 @@ namespace ICS
 
 	// from http://www.cplusplus.com/forum/articles/9645/
 	template <typename T>
-	T FromString ( const std::string &Text )//Text not by const reference so that the function can be used with a 
+	T FromString ( const std::string &Text )//Text not by const reference so that the function can be used with a
 	{											//character array as argument
 		std::stringstream ss(Text);
 		T result;

extern/sdl4ogre/sdlinputwrapper.hpp

@@ -1,6 +1,8 @@
 #ifndef SDL4OGRE_SDLINPUTWRAPPER_H
 #define SDL4OGRE_SDLINPUTWRAPPER_H
 
+#define NOMINMAX
+
 #include <SDL_events.h>
 
 #include <OgreRenderWindow.h>