mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-27 03:35:27 +00:00
Merge remote-tracking branch 'cc9cii/master'
This commit is contained in:
commit
82eb13c070
@ -3,6 +3,7 @@
|
||||
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
#include <cctype> // std::isalnum
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
|
||||
|
1
extern/oics/ICSPrerequisites.h
vendored
1
extern/oics/ICSPrerequisites.h
vendored
@ -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"
|
||||
|
||||
|
2
extern/sdl4ogre/sdlinputwrapper.hpp
vendored
2
extern/sdl4ogre/sdlinputwrapper.hpp
vendored
@ -1,6 +1,8 @@
|
||||
#ifndef SDL4OGRE_SDLINPUTWRAPPER_H
|
||||
#define SDL4OGRE_SDLINPUTWRAPPER_H
|
||||
|
||||
#define NOMINMAX
|
||||
|
||||
#include <SDL_events.h>
|
||||
|
||||
#include <OgreRenderWindow.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user