[Scummvm-cvs-logs] SF.net SVN: scummvm:[48362] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Mar 23 00:04:56 CET 2010


Revision: 48362
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48362&view=rev
Author:   fingolfin
Date:     2010-03-22 23:04:55 +0000 (Mon, 22 Mar 2010)

Log Message:
-----------
Patch #2938173: LinuxMoto update 23012010

Modified Paths:
--------------
    scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp
    scummvm/trunk/dists/motoezx/scummvm.lin
    scummvm/trunk/dists/motomagx/mgx/scummvm.lin
    scummvm/trunk/dists/motomagx/mpkg/mySDL.cfg
    scummvm/trunk/dists/motomagx/mpkg/scummvm.sh
    scummvm/trunk/dists/motomagx/pep/app/scummvm.sh

Modified: scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp	2010-03-22 23:04:12 UTC (rev 48361)
+++ scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp	2010-03-22 23:04:55 UTC (rev 48362)
@@ -116,11 +116,19 @@
 #endif
 
 #ifdef MOTOMAGX
-	// Quit on cancel
-	if (ev.key.keysym.sym == SDLK_F12) {
+	// Quit on Clr
+	if (ev.key.keysym.sym == SDLK_BACKSPACE) {
 		event.type = Common::EVENT_QUIT;
 		return true;
 	}
+	// Game Menu - Left Soft key
+	else if (ev.key.keysym.sym == SDLK_F9) {
+		ev.key.keysym.sym = SDLK_F5;
+	}
+	// VirtualKeyboard - Right Soft key
+	else if (ev.key.keysym.sym == SDLK_F11) {
+		ev.key.keysym.sym = SDLK_F7;
+	}      
 #endif
 
 // Joystick to Mouse

Modified: scummvm/trunk/dists/motoezx/scummvm.lin
===================================================================
--- scummvm/trunk/dists/motoezx/scummvm.lin	2010-03-22 23:04:12 UTC (rev 48361)
+++ scummvm/trunk/dists/motoezx/scummvm.lin	2010-03-22 23:04:55 UTC (rev 48362)
@@ -1,10 +1,12 @@
 #!/bin/sh
-. /home/native/.profile
-myfile=`basename $0`
-mypath=`echo $0 | sed -e 's/'$myfile'//g'`
-export LD_LIBRARY_PATH=/mmc/mmca1/games/lib:$LD_LIBRARY_PATH
+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 SDL_QT_MODIFICATOR=1
-export HOME=/mmc/mmca1/games
+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

Modified: scummvm/trunk/dists/motomagx/mgx/scummvm.lin
===================================================================
--- scummvm/trunk/dists/motomagx/mgx/scummvm.lin	2010-03-22 23:04:12 UTC (rev 48361)
+++ scummvm/trunk/dists/motomagx/mgx/scummvm.lin	2010-03-22 23:04:55 UTC (rev 48362)
@@ -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

Modified: scummvm/trunk/dists/motomagx/mpkg/mySDL.cfg
===================================================================
--- scummvm/trunk/dists/motomagx/mpkg/mySDL.cfg	2010-03-22 23:04:12 UTC (rev 48361)
+++ scummvm/trunk/dists/motomagx/mpkg/mySDL.cfg	2010-03-22 23:04:55 UTC (rev 48362)
@@ -1,6 +1,6 @@
 [SDL]
 LeftSoftkey = F9
-RightSoftkey = PERIOD
+RightSoftkey = F11
 Up = UP
 Down = DOWN
 Left = LEFT
@@ -8,12 +8,12 @@
 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

Modified: scummvm/trunk/dists/motomagx/mpkg/scummvm.sh
===================================================================
--- scummvm/trunk/dists/motomagx/mpkg/scummvm.sh	2010-03-22 23:04:12 UTC (rev 48361)
+++ scummvm/trunk/dists/motomagx/mpkg/scummvm.sh	2010-03-22 23:04:55 UTC (rev 48362)
@@ -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

Modified: scummvm/trunk/dists/motomagx/pep/app/scummvm.sh
===================================================================
--- scummvm/trunk/dists/motomagx/pep/app/scummvm.sh	2010-03-22 23:04:12 UTC (rev 48361)
+++ scummvm/trunk/dists/motomagx/pep/app/scummvm.sh	2010-03-22 23:04:55 UTC (rev 48362)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list