- Updated SDL dependency to SDL2

- fixed compilation issues with cmake and visual studio 2015
This commit is contained in:
xawotihs
2015-10-04 23:10:45 +02:00
parent 4272e2e2b2
commit 22d14b2a4f
25 changed files with 119 additions and 89 deletions

View File

@@ -8,10 +8,10 @@
#include "Counters.h"
#include "AllAbilities.h"
#if !defined(QT_CONFIG)
#include <boost/scoped_ptr.hpp>
typedef boost::scoped_ptr<ManaCost> ManaCostPtr;
#else
#if (__cplusplus > 199711L) || (_MSC_VER >= 1700)
//#include <unique_ptr>
typedef std::unique_ptr<ManaCost> ManaCostPtr;
#elif defined(QT_CONFIG)
#include <QScopedPointer>
class ManaCostPtr : public QScopedPointer<ManaCost>
{
@@ -21,6 +21,9 @@ public:
ManaCost* get() const {return data();};
};
#else
#include <boost/scoped_ptr.hpp>
typedef boost::scoped_ptr<ManaCost> ManaCostPtr;
#endif
SUPPORT_OBJECT_ANALYTICS(ExtraCost)