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:
@@ -28,18 +28,26 @@
|
||||
#include <Qt>
|
||||
typedef u32 LocalKeySym;
|
||||
#define LOCAL_KEY_NONE Qt::Key_unknown
|
||||
|
||||
#elif defined(WIN32)
|
||||
#include <windows.h>
|
||||
typedef WPARAM LocalKeySym;
|
||||
#define LOCAL_KEY_NONE ((WPARAM)-1)
|
||||
|
||||
#elif defined(LINUX)
|
||||
#include <X11/XKBlib.h>
|
||||
#include <X11/keysym.h>
|
||||
typedef KeySym LocalKeySym;
|
||||
#define LOCAL_KEY_NONE XK_VoidSymbol
|
||||
|
||||
#elif defined(ANDROID) // This is temporary until we understand how to send real key events from Java
|
||||
typedef long unsigned int LocalKeySym;
|
||||
#define LOCAL_KEY_NONE 0
|
||||
|
||||
#else
|
||||
typedef u32 LocalKeySym;
|
||||
#define LOCAL_KEY_NONE ((u32)-1)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -51,7 +59,7 @@ u8 JGEGetAnalogX();
|
||||
u8 JGEGetAnalogY();
|
||||
bool JGEToggleFullscreen();
|
||||
|
||||
#if !defined(WIN32) && !defined(LINUX) && !defined(IOS)
|
||||
#if defined (PSP)
|
||||
|
||||
// hack to fix a typedef definition of u32 inside of newlib's stdint.h
|
||||
// this used to be defined as an unsigned long, but as of minpspw 11.1, it's
|
||||
|
||||
Reference in New Issue
Block a user