aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/maemo
diff options
context:
space:
mode:
Diffstat (limited to 'backends/platform/maemo')
-rw-r--r--backends/platform/maemo/debian/changelog18
-rwxr-xr-xbackends/platform/maemo/debian/rules18
-rw-r--r--backends/platform/maemo/maemo.cpp26
3 files changed, 46 insertions, 16 deletions
diff --git a/backends/platform/maemo/debian/changelog b/backends/platform/maemo/debian/changelog
index 49e8de69d6..e4c5c58ccd 100644
--- a/backends/platform/maemo/debian/changelog
+++ b/backends/platform/maemo/debian/changelog
@@ -1,3 +1,21 @@
+scummvm (1.9.0~git) unstable; urgency=low
+
+ * Development snapshot
+
+ -- Tarek Soliman <tsoliman@scummvm.org> Fri, 26 Feb 2016 21:11:20 -0600
+
+scummvm (1.8.1) unstable; urgency=low
+
+ * 1.8.1 release
+
+ -- Tarek Soliman <tsoliman@scummvm.org> Fri, 20 May 2016 20:05:11 -0500
+
+scummvm (1.8.0) unstable; urgency=low
+
+ * 1.8.0 release
+
+ -- Tarek Soliman <tsoliman@scummvm.org> Fri, 26 Feb 2016 21:11:20 -0600
+
scummvm (1.7.0) unstable; urgency=low
* 1.7.0 release
diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules
index 2aa7f339c9..0e72c8aa9a 100755
--- a/backends/platform/maemo/debian/rules
+++ b/backends/platform/maemo/debian/rules
@@ -6,8 +6,8 @@ build: scummvm
scummvm:
dh_testdir
- ./configure --host=maemo
- $(MAKE)
+ ./configure --host=maemo $(CONFIGURE_EXTRA_ARGS)
+ $(MAKE) $(MAKE_EXTRA_ARGS)
clean:
dh_testdir
@@ -48,7 +48,19 @@ install: build
install -m0644 backends/vkeybd/packs/vkeybd_default.zip debian/scummvm/opt/scummvm/share
install -m0644 backends/vkeybd/packs/vkeybd_small.zip debian/scummvm/opt/scummvm/share
# for optified version we can also add engine datafiles
- install -m0644 dists/engine-data/drascula.dat dists/engine-data/hugo.dat dists/engine-data/kyra.dat dists/engine-data/lure.dat dists/engine-data/queen.tbl dists/engine-data/sky.cpt dists/engine-data/teenagent.dat dists/engine-data/tony.dat dists/engine-data/toon.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/access.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/drascula.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/hugo.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/kyra.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/lure.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/mort.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/neverhood.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/queen.tbl debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/sky.cpt debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/teenagent.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/tony.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/toon.dat debian/scummvm/opt/scummvm/share
+ install -m0644 dists/engine-data/wintermute.zip debian/scummvm/opt/scummvm/share
install -m0644 -d debian/scummvm/usr/share/doc/scummvm
install -m0644 AUTHORS COPYING COPYING.BSD COPYING.FREEFONT COPYING.LGPL COPYRIGHT NEWS README debian/scummvm/usr/share/doc/scummvm
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp
index 5fdcddac43..dc1054940e 100644
--- a/backends/platform/maemo/maemo.cpp
+++ b/backends/platform/maemo/maemo.cpp
@@ -52,31 +52,31 @@ OSystem_SDL_Maemo::~OSystem_SDL_Maemo() {
#ifdef ENABLE_KEYMAPPER
static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymapperDefaultBindings, Model _model) {
- _keymapperDefaultBindings->setDefaultBinding("gui", "REM", "HOME");
- _keymapperDefaultBindings->setDefaultBinding("global", "REM", "HOME");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "REMP", "HOME");
+ _keymapperDefaultBindings->setDefaultBinding("global", "REMP", "HOME");
if (_model.hasMenuKey && _model.hasHwKeyboard) {
- _keymapperDefaultBindings->setDefaultBinding("gui", "FUL", "FULLSCREEN");
- _keymapperDefaultBindings->setDefaultBinding("global", "FUL", "FULLSCREEN");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "FULS", "FULLSCREEN");
+ _keymapperDefaultBindings->setDefaultBinding("global", "FULS", "FULLSCREEN");
}
if (_model.hasHwKeyboard) {
- _keymapperDefaultBindings->setDefaultBinding("gui", "VIR", "C+ZOOMMINUS");
- _keymapperDefaultBindings->setDefaultBinding("global", "VIR", "C+ZOOMMINUS");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "VIRT", "C+ZOOMMINUS");
+ _keymapperDefaultBindings->setDefaultBinding("global", "VIRT", "C+ZOOMMINUS");
} else {
- _keymapperDefaultBindings->setDefaultBinding("gui", "VIR", "FULLSCREEN");
- _keymapperDefaultBindings->setDefaultBinding("global", "VIR", "FULLSCREEN");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "VIRT", "FULLSCREEN");
+ _keymapperDefaultBindings->setDefaultBinding("global", "VIRT", "FULLSCREEN");
}
if (_model.hasMenuKey )
- _keymapperDefaultBindings->setDefaultBinding("global", "MEN", "MENU");
+ _keymapperDefaultBindings->setDefaultBinding("global", "MENU", "MENU");
else
- _keymapperDefaultBindings->setDefaultBinding("global", "MEN", "S+C+M");
+ _keymapperDefaultBindings->setDefaultBinding("global", "MENU", "S+C+M");
- _keymapperDefaultBindings->setDefaultBinding("gui", "CLO", "ESCAPE");
+ _keymapperDefaultBindings->setDefaultBinding("gui", "CLOS", "ESCAPE");
- _keymapperDefaultBindings->setDefaultBinding("maemo", "RCL", "ZOOMPLUS");
- _keymapperDefaultBindings->setDefaultBinding("maemo", "CLK", "ZOOMMINUS");
+ _keymapperDefaultBindings->setDefaultBinding("maemo", "RCLK", "ZOOMPLUS");
+ _keymapperDefaultBindings->setDefaultBinding("maemo", "CLKM", "ZOOMMINUS");
}
#endif