Merge remote-tracking branch 'cc9cii/master'

11 years ago · 82eb13c070
parent 013916fca3 37f0c253f6
commit 82eb13c070
3 changed files with 5 additions and 1 deletions
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@ -3,6 +3,7 @@

 #include <sstream>
 #include <stdexcept>
+#include <cctype> // std::isalnum

 #include <boost/filesystem.hpp>

--- a/extern/oics/ICSPrerequisites.h
+++ b/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"

--- a/extern/sdl4ogre/sdlinputwrapper.hpp
+++ b/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>