diff options
| author | Klaus Reimer | 2011-04-03 23:28:04 +0200 |
|---|---|---|
| committer | Max Horn | 2011-04-12 11:11:16 +0200 |
| commit | 2160ecfe3a81eb9ab4fff9b5ac1b2c96200d3a07 (patch) | |
| tree | 63143a32675141bc0f7597713b6b2010dc201d17 | |
| parent | a899ec286f1726781ba1ed772fcda4dab81c40c8 (diff) | |
| download | scummvm-rg350-2160ecfe3a81eb9ab4fff9b5ac1b2c96200d3a07.tar.gz scummvm-rg350-2160ecfe3a81eb9ab4fff9b5ac1b2c96200d3a07.tar.bz2 scummvm-rg350-2160ecfe3a81eb9ab4fff9b5ac1b2c96200d3a07.zip | |
WEBOS: Disable vkeybd, fix more directory references with wrong package name
The vkeybd XML can't be read for some reason.
| -rw-r--r-- | backends/platform/webos/webos.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/webos/webos.mk | 7 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | dists/webos/mojo/scummvmrc-default | 4 | ||||
| -rwxr-xr-x | dists/webos/mojo/start | 3 |
5 files changed, 12 insertions, 6 deletions
diff --git a/backends/platform/webos/webos.cpp b/backends/platform/webos/webos.cpp index 597da005ed..34d6f68261 100644 --- a/backends/platform/webos/webos.cpp +++ b/backends/platform/webos/webos.cpp @@ -30,7 +30,7 @@ OSystem_SDL_WebOS::OSystem_SDL_WebOS() : - OSystem_POSIX("/media/cryptofs/apps/usr/palm/applications/org.scummvm/scummvmrc") { + OSystem_POSIX("/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm/scummvmrc") { } void OSystem_SDL_WebOS::initBackend() { diff --git a/backends/platform/webos/webos.mk b/backends/platform/webos/webos.mk index f26dc02ee8..e567b387bc 100644 --- a/backends/platform/webos/webos.mk +++ b/backends/platform/webos/webos.mk @@ -1,7 +1,7 @@ # WebOS specific build targets PATH_DIST = $(srcdir)/dists/webos -PATH_RESOURCES = $(PATH_DIST)/mojo +PATH_MOJO = $(PATH_DIST)/mojo STAGING_DIR=STAGING/org.scummvm.scummvm @@ -11,7 +11,10 @@ webosrelease: mkdir -p $(STAGING_DIR) mkdir -p $(STAGING_DIR)/bin mkdir -p $(STAGING_DIR)/lib - cp -f $(PATH_RESOURCES)/* $(STAGING_DIR) + mkdir -p $(STAGING_DIR)/share/scummvm + cp -f $(PATH_MOJO)/* $(STAGING_DIR) + cp -f gui/themes/translations.dat $(STAGING_DIR)/share/scummvm + cp -f gui/themes/scummmodern.zip $(STAGING_DIR)/share/scummvm cp -f scummvm $(STAGING_DIR)/bin $(WEBOS_PDK)/arm-gcc/bin/arm-none-linux-gnueabi-strip $(STAGING_DIR)/bin/scummvm $(WEBOS_SDK)/bin/palm-package $(STAGING_DIR) @@ -2067,7 +2067,7 @@ if test -n "$_host"; then _timidity=no _mt32emu=no _seq_midi=no - _vkeybd=yes + _vkeybd=no _keymapper=yes ;; wii) diff --git a/dists/webos/mojo/scummvmrc-default b/dists/webos/mojo/scummvmrc-default index e71f0fb799..d29a0fc6db 100644 --- a/dists/webos/mojo/scummvmrc-default +++ b/dists/webos/mojo/scummvmrc-default @@ -1,4 +1,5 @@ [scummvm] +gui_theme=scummmodern mute=false speech_volume=192 native_mt32=false @@ -13,7 +14,6 @@ autosave_period=300 music_driver=auto opl_driver=auto aspect_ratio=false -versioninfo=1.0.0 speech_mute=false enable_gs=false browser_lastpath=/media/internal/ScummVM/Games @@ -21,7 +21,7 @@ themepath=/media/internal/ScummVM/Themes savepath=/media/internal/ScummVM/Saves extrapath=/media/internal/ScummVM/Extras pluginspath=/media/internal/ScummVM/Plugins -vkeybdpath=/media/cryptofs/apps/usr/palm/applications/org.scummvm/share/scummvm +vkeybdpath=/media/cryptofs/apps/usr/palm/applications/org.scummvm.scummvm/share/scummvm [keymapper] keymap_global_MEN=FORWARD diff --git a/dists/webos/mojo/start b/dists/webos/mojo/start index 5a338e0b62..55a7999502 100755 --- a/dists/webos/mojo/start +++ b/dists/webos/mojo/start @@ -17,6 +17,9 @@ then cp $APPDIR/scummvmrc-default $APPDIR/scummvmrc fi +# Copy themes to theme directory +cp -f $APPDIR/share/scummvm/*.zip /media/internal/ScummVM/Themes + # Change into the screenshots directory so screenshots are saved there cd /media/internal/ScummVM/Screenshots |