mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-09-28 07:32:00 -04:00
Merge remote-tracking branch 'cc9cii/master'
This commit is contained in:
commit
82eb13c070
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
#include <cctype> // std::isalnum
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
|
|
||||||
|
3
extern/oics/ICSPrerequisites.h
vendored
3
extern/oics/ICSPrerequisites.h
vendored
@ -36,6 +36,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
#include <algorithm> /* std::min and std::max for MSVC 2013 */
|
||||||
|
|
||||||
#include "tinyxml.h"
|
#include "tinyxml.h"
|
||||||
|
|
||||||
@ -90,7 +91,7 @@ namespace ICS
|
|||||||
|
|
||||||
// from http://www.cplusplus.com/forum/articles/9645/
|
// from http://www.cplusplus.com/forum/articles/9645/
|
||||||
template <typename T>
|
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
|
{ //character array as argument
|
||||||
std::stringstream ss(Text);
|
std::stringstream ss(Text);
|
||||||
T result;
|
T result;
|
||||||
|
2
extern/sdl4ogre/sdlinputwrapper.hpp
vendored
2
extern/sdl4ogre/sdlinputwrapper.hpp
vendored
@ -1,6 +1,8 @@
|
|||||||
#ifndef SDL4OGRE_SDLINPUTWRAPPER_H
|
#ifndef SDL4OGRE_SDLINPUTWRAPPER_H
|
||||||
#define SDL4OGRE_SDLINPUTWRAPPER_H
|
#define SDL4OGRE_SDLINPUTWRAPPER_H
|
||||||
|
|
||||||
|
#define NOMINMAX
|
||||||
|
|
||||||
#include <SDL_events.h>
|
#include <SDL_events.h>
|
||||||
|
|
||||||
#include <OgreRenderWindow.h>
|
#include <OgreRenderWindow.h>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user