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/linuxmoto | |
| 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/linuxmoto')
| -rw-r--r-- | backends/platform/linuxmoto/hardwarekeys.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/linuxmoto/linuxmoto-sdl.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/backends/platform/linuxmoto/hardwarekeys.cpp b/backends/platform/linuxmoto/hardwarekeys.cpp index e10e39a23d..cbd9dccf52 100644 --- a/backends/platform/linuxmoto/hardwarekeys.cpp +++ b/backends/platform/linuxmoto/hardwarekeys.cpp @@ -106,9 +106,8 @@ static const Mod modifiers[] = { { KBD_SHIFT | KBD_CTRL | KBD_ALT, "C+A+", "Ctrl+Alt+", true }, { 0, 0, 0, false } }; -#endif - Common::HardwareKeySet *OSystem_LINUXMOTO::getHardwareKeySet() { return OSystem_SDL::getHardwareKeySet(); } +#endif diff --git a/backends/platform/linuxmoto/linuxmoto-sdl.h b/backends/platform/linuxmoto/linuxmoto-sdl.h index 97262ccbca..9a0be56e11 100644 --- a/backends/platform/linuxmoto/linuxmoto-sdl.h +++ b/backends/platform/linuxmoto/linuxmoto-sdl.h @@ -29,8 +29,10 @@ class OSystem_LINUXMOTO : public OSystem_POSIX { public: virtual void initBackend(); +#ifdef ENABLE_KEYMAPPER // FIXME: This just calls parent methods, is it needed? virtual Common::HardwareKeySet *getHardwareKeySet(); +#endif }; #endif |