libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP2X: More compilation fixes

Browse Source 
svn-id: r54569
This commit is contained in:
Max Horn 2010-11-29 10:43:14 +00:00
parent fba6ee8af9
commit 1ef8d5e38a
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backends/events/gp2xsdl/gp2xsdl-events.cpp
View File

@ -25,6 +25,9 @@
#if defined(GP2X) || defined(GP2XWIZ) #if defined(GP2X) || defined(GP2XWIZ)
// Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
#include "backends/events/gp2xsdl/gp2xsdl-events.h" #include "backends/events/gp2xsdl/gp2xsdl-events.h"
#if defined(GP2X) #if defined(GP2X)
#include "backends/platform/gp2x/gp2x-hw.h" #include "backends/platform/gp2x/gp2x-hw.h"
@ -200,28 +203,6 @@ bool GP2XSdlEventSource::handleKeyDown(SDL_Event &ev, Common::Event &event) {
return true; return true;
} }
bool GP2XSdlEventSource::handleKeyUp(SDL_Event &ev, Common::Event &event) {
if (remapKey(ev, event))
return true;
event.type = Common::EVENT_KEYUP;
event.kbd.keycode = (Common::KeyCode)ev.key.keysym.sym;
event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
// Ctrl-Alt-<key> will change the GFX mode
SDLModToOSystemKeyFlags(SDL_GetModState(), event);
// Set the scroll lock sticky flag
if (_scrollLock)
event.kbd.flags |= Common::KBD_SCRL;
if (isScalerHotkey(event))
// Swallow these key up events
return false;
return true;
}
bool GP2XSdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { bool GP2XSdlEventSource::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) {
_stickBtn[ev.jbutton.button] = 1; _stickBtn[ev.jbutton.button] = 1;

1
backends/events/gp2xsdl/gp2xsdl-events.h
View File

@ -47,7 +47,6 @@ protected:
void moveStick(); void moveStick();
virtual bool handleKeyDown(SDL_Event &ev, Common::Event &event); virtual bool handleKeyDown(SDL_Event &ev, Common::Event &event);
virtual bool handleKeyUp(SDL_Event &ev, Common::Event &event);
virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event); virtual bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event);
virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event); virtual bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event);
virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event); virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event);

3
backends/graphics/gp2xsdl/gp2xsdl-graphics.cpp
View File

@ -25,6 +25,9 @@
#ifdef GP2X #ifdef GP2X
// Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
#include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h" #include "backends/graphics/gp2xsdl/gp2xsdl-graphics.h"
#include "graphics/scaler/aspect.h" #include "graphics/scaler/aspect.h"
#include <SDL_gp2x.h> #include <SDL_gp2x.h>