diff options
| author | Johannes Schickel | 2012-02-13 01:20:02 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-02-13 01:20:02 +0100 |
| commit | d811240a9d38098f5b1f77b7d8dbef7a947f9a67 (patch) | |
| tree | e2c904f96cbfa725bb70f378a82d576386a4db3e /backends/platform/sdl | |
| parent | 143363d5b6baef14898ee0f41e3735de2048761a (diff) | |
| download | scummvm-rg350-d811240a9d38098f5b1f77b7d8dbef7a947f9a67.tar.gz scummvm-rg350-d811240a9d38098f5b1f77b7d8dbef7a947f9a67.tar.bz2 scummvm-rg350-d811240a9d38098f5b1f77b7d8dbef7a947f9a67.zip | |
ALL: Enable Keymapper specific OSystem API only when the Keymapper is enabled.
Diffstat (limited to 'backends/platform/sdl')
| -rw-r--r-- | backends/platform/sdl/hardwarekeys.cpp | 7 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/backends/platform/sdl/hardwarekeys.cpp b/backends/platform/sdl/hardwarekeys.cpp index 3e9378602e..1469698a8b 100644 --- a/backends/platform/sdl/hardwarekeys.cpp +++ b/backends/platform/sdl/hardwarekeys.cpp @@ -174,13 +174,8 @@ static const ModifierTableEntry sdlModifiers[] = { { KBD_SHIFT | KBD_CTRL | KBD_ALT, "C+A+", "Ctrl+Alt+", true }, { 0, 0, 0, false } }; -#endif - Common::HardwareKeySet *OSystem_SDL::getHardwareKeySet() { -#ifdef ENABLE_KEYMAPPER return new HardwareKeySet(sdlKeys, sdlModifiers); -#else - return 0; -#endif } +#endif diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 6c84c5c26a..1b0204a6e1 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -63,7 +63,9 @@ public: virtual void engineInit(); virtual void engineDone(); #endif +#ifdef ENABLE_KEYMAPPER virtual Common::HardwareKeySet *getHardwareKeySet(); +#endif virtual void quit(); virtual void fatalError(); |