- Removed dependencies on Boost/string in mtg sources
- Removes dependencies on Boost/shared_ptr in mtg sources only for WP8 for the moment - Various compilation fixes on WP8
This commit is contained in:
@@ -21,9 +21,11 @@
|
||||
|
||||
#include "GameOptions.h"
|
||||
|
||||
#ifndef WP8
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#endif
|
||||
|
||||
#if defined (IOS) || defined (ANDROID) || defined (QT_CONFIG) || defined (SDL_CONFIG)
|
||||
#if defined (WP8) || defined (IOS) || defined (ANDROID) || defined (QT_CONFIG) || defined (SDL_CONFIG)
|
||||
#define TOUCH_ENABLED
|
||||
#endif
|
||||
|
||||
|
||||
@@ -173,8 +173,7 @@ protected:
|
||||
int *mGBCode;
|
||||
int mCurr;
|
||||
|
||||
u32 * mCharBuffer;
|
||||
|
||||
PIXEL_TYPE* mCharBuffer;
|
||||
virtual int PreCacheChar(const u8 *ch);
|
||||
};
|
||||
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
#ifndef WRESOURCE_FWD_H
|
||||
#define WRESOURCE_FWD_H
|
||||
|
||||
#ifndef WP8
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
typedef boost::shared_ptr<JQuad> JQuadPtr;
|
||||
#else
|
||||
#include <memory>
|
||||
typedef std::shared_ptr<JQuad> JQuadPtr;
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef _DEBUG_H_
|
||||
#define _DEBUG_H_
|
||||
|
||||
#if (defined WIN32) && (!defined QT_CONFIG)
|
||||
#if ((defined WIN32) || (defined WP8)) && (!defined QT_CONFIG)
|
||||
#define snprintf sprintf_s
|
||||
#endif
|
||||
|
||||
|
||||
@@ -136,4 +136,8 @@ template <class T> istream& operator>>(istream& in, T& p)
|
||||
return in;
|
||||
}
|
||||
*/
|
||||
|
||||
/* replace_all ... replacement to avoid depending on boost for that */
|
||||
void ReplaceString(std::string& subject, const std::string& search, const std::string& replace);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user