Patch #2938173: LinuxMoto update 23012010

svn-id: r48362

4 files changed, 35 insertions, 28 deletions

diff --git a/dists/motomagx/mgx/scummvm.lin b/dists/motomagx/mgx/scummvm.lin
index f75a665d7a..83d3fcf0ed 100644
--- a/dists/motomagx/mgx/scummvm.lin
+++ b/dists/motomagx/mgx/scummvm.lin
@@ -1,10 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 mypath=${0%/*}
-GAMES=/mmc/mmca1/games
-export LIBDIR1=/ezxlocal/download/mystuff/games/lib
-export LIBDIR2=$GAMES/lib
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2
-export SDL_QT_MODIFICATOR=1
-export HOME=$GAMES
+LIBDIR1=/ezxlocal/download/mystuff/games/lib
+LIBDIR2=/mmc/mmca1/games/lib
+LIBDIR3=/mmc/mmca1/.Games/.lib
+#LIBDIR3=/mmc/mmca1/.system/lib
+LIBDIR4=$mypath/lib
+#export SDL_QT_INVERT_ROTATION=1
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2:$LIBDIR3:$LIBDIR4
+export HOME=$mypath
 cd $mypath
 exec $mypath/scummvm --gfx-mode=1x > $mypath/scummvm.log
diff --git a/dists/motomagx/mpkg/mySDL.cfg b/dists/motomagx/mpkg/mySDL.cfg
index 152a207252..f3f4ad860b 100644
--- a/dists/motomagx/mpkg/mySDL.cfg
+++ b/dists/motomagx/mpkg/mySDL.cfg
@@ -1,6 +1,6 @@
 [SDL]
 LeftSoftkey = F9
-RightSoftkey = PERIOD
+RightSoftkey = F11
 Up = UP
 Down = DOWN
 Left = LEFT
@@ -8,12 +8,12 @@ Right = RIGHT
 Center = RETURN
 VolumeUp = PLUS
 VolumeDown = MINUS
-SideKey = F5
-Call = F7
+SideKey = SPACE
 Music = F10
+Call = TAB
 Red = ESCAPE
 C = BACKSPACE
-Camera = MINIMIZE
+Camera = PAUSE
 Slider = 0
 0 = 0
 1 = 1
diff --git a/dists/motomagx/mpkg/scummvm.sh b/dists/motomagx/mpkg/scummvm.sh
index 9570d8d2ce..1f09e7eaae 100644
--- a/dists/motomagx/mpkg/scummvm.sh
+++ b/dists/motomagx/mpkg/scummvm.sh
@@ -1,11 +1,14 @@
 #!/bin/sh
-GAMES=/mmc/mmca1/.Games
-DIR=`busybox dirname "$0"`
-LIBDIR=/mmc/mmca1/.system/lib
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR
-export SDL_QT_MODIFICATOR=1
-export HOME=$GAMES
-cd $DIR
+mypath=${0%/*}
+LIBDIR1=/ezxlocal/download/mystuff/games/lib
+LIBDIR2=/mmc/mmca1/games/lib
+#LIBDIR3=/mmc/mmca1/.Games/.lib
+LIBDIR3=/mmc/mmca1/.system/lib
+LIBDIR4=$mypath/lib
+#export SDL_QT_INVERT_ROTATION=1
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2:$LIBDIR3:$LIBDIR4
+export HOME=$mypath
 rm /mmc/mmca1/.system/mySDL.cfg
-cp $DIR/mySDL.cfg /mmc/mmca1/.system/mySDL.cfg
-exec $DIR/scummvm --gfx-mode=1x > $DIR/scummvm.log
+cp $mypath/mySDL.cfg /mmc/mmca1/.system/mySDL.cfg
+cd $mypath
+exec $mypath/scummvm --gfx-mode=1x > $mypath/scummvm.log
diff --git a/dists/motomagx/pep/app/scummvm.sh b/dists/motomagx/pep/app/scummvm.sh
index 03a27f49db..83d3fcf0ed 100644
--- a/dists/motomagx/pep/app/scummvm.sh
+++ b/dists/motomagx/pep/app/scummvm.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
-GAMES=/mmc/mmca1/.Games
-export LD_LIBRARY_PATH=$GAMES/.lib:$LD_LIBRARY_PATH
-# uncomment next line if you wanna 270-degrees clockwise rotated screen 
+mypath=${0%/*}
+LIBDIR1=/ezxlocal/download/mystuff/games/lib
+LIBDIR2=/mmc/mmca1/games/lib
+LIBDIR3=/mmc/mmca1/.Games/.lib
+#LIBDIR3=/mmc/mmca1/.system/lib
+LIBDIR4=$mypath/lib
 #export SDL_QT_INVERT_ROTATION=1
-GAME_PATH=`basename $0`
-GAME_PATH=`echo $0 | sed -e 's/'$GAME_PATH'//g'`
-cd "$GAME_PATH"
-export HOME="$GAMES"
-exec ./scummvm --gfx-mode=1x > $GAME_PATH/scummvm.log
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBDIR1:$LIBDIR2:$LIBDIR3:$LIBDIR4
+export HOME=$mypath
+cd $mypath
+exec $mypath/scummvm --gfx-mode=1x > $mypath/scummvm.log