- Updated SDL dependency to SDL2

- fixed compilation issues with cmake and visual studio 2015
2015-10-04 23:10:45 +02:00
parent 4272e2e2b2
commit 22d14b2a4f
25 changed files with 119 additions and 89 deletions
@@ -21,10 +21,10 @@

 #include "GameOptions.h"

-#if !defined(WP8) && !defined(QT_CONFIG)
-#include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
-#endif
+//#if !defined(WP8) && !defined(QT_CONFIG)
+//#include <boost/shared_ptr.hpp>
+//#include <boost/scoped_ptr.hpp>
+//#endif

 #if defined (WP8) || defined (IOS) || defined (ANDROID) || defined (QT_CONFIG) || defined (SDL_CONFIG)
 #define TOUCH_ENABLED
@@ -1,7 +1,7 @@
 #ifndef WRESOURCE_FWD_H
 #define WRESOURCE_FWD_H

-#if (__cplusplus > 199711L)
+#if (__cplusplus > 199711L)  || (_MSC_VER >= 1700)
 #include <memory>
 typedef std::shared_ptr<JQuad> JQuadPtr;
 #elif defined(QT_CONFIG)