Some preparation work for new platform support.
- Added a "PSP" compile-time define to clean up some compile time checks (replaced !WIN32 && !LINUX && !IOS with PSP) -- Wil, I am aware that this is redundant with the PSPENV variable you introduced recently, I think we can clean that up easily -- This looks like lots of changes, but most of the time I just moved some blocks here and there -- tested on VC 2010, PSP, and a bit of NDK -- I might have broken maemo, iOS, or Linux compilation, can you guys check? - Fixed some warnings reported by NDK - NDK still does not compile because recent boost additions (mutex, etc...) are apparently not supported
This commit is contained in:
@@ -10,7 +10,7 @@ using std::map;
|
||||
static map<const LocalKeySym, KeyRep> fattable;
|
||||
static map<const JButton, KeyRep> slimtable;
|
||||
|
||||
#if defined(LINUX) || defined (IOS)
|
||||
#if defined(LINUX) || defined (IOS) || defined (ANDROID)
|
||||
const KeyRep& translateKey(LocalKeySym key)
|
||||
{
|
||||
{
|
||||
@@ -20,13 +20,13 @@ const KeyRep& translateKey(LocalKeySym key)
|
||||
}
|
||||
|
||||
char* str = NULL;
|
||||
#if !defined(QT_CONFIG) && !defined(IOS)
|
||||
#if !defined(QT_CONFIG) && !defined(IOS) && !defined(ANDROID)
|
||||
str = XKeysymToString(key);
|
||||
#endif // QT_CONFIG
|
||||
if (!str)
|
||||
{
|
||||
str = NEW char[11];
|
||||
sprintf(str, "%lu", key);
|
||||
sprintf(str, "%lu", key); //TODO: Wagic is not supposed to know that a key actually is an unsingned long, so this part should probably be platform specific (move to JGE ?)
|
||||
}
|
||||
const KeyRep k = make_pair(str, static_cast<JQuad*>(NULL));
|
||||
fattable[key] = k;
|
||||
|
||||
Reference in New Issue
Block a user