[Scummvm-cvs-logs] SF.net SVN: scummvm:[42848] scummvm/branches/branch-1-0-0/backends/platform /gp2xwiz/build

[djwillis at users.sourceforge.net]

Revision: 42848
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42848&view=rev
Author:   djwillis
Date:     2009-07-27 18:06:41 +0000 (Mon, 27 Jul 2009)

Log Message:
-----------
Backport r42847 - GP2XWiz: Update GP2X Wiz bundle.sh to copy libraries into the distribution file from the tool chain where the libraries are broken on the device. Also add LD_LIBRARY_PATH 'hack' to launch script to ensure bundled libraries are used over system ones. Also update backend README-GP2XWIZ.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/README-GP2XWIZ
    scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/bundle.sh
    scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/scummvm.gpe

Modified: scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/README-GP2XWIZ
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/README-GP2XWIZ	2009-07-27 18:05:16 UTC (rev 42847)
+++ scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/README-GP2XWIZ	2009-07-27 18:06:41 UTC (rev 42848)
@@ -1,4 +1,4 @@
-ScummVM - GP2X WIZ SPECIFIC README - HEAD SVN
+ScummVM - GP2X WIZ SPECIFIC README - 1.0.0
 ------------------------------------------------------------------------
 
 Contents:
@@ -23,20 +23,10 @@
 This is the readme for the offficial GP2X WIZ ScummVM backend (also known as
 the GP2X WIZ port).
 
-This is an SVN test release of ScummVM for the GP2X WIZ, it would be
-appreciated if this SVN test distribution was not mirrored and that
-people be directed to http://scummvm.distant-earth.com/ instead for
-updated SVN builds.
-
 Full supported official releases of the GP2X WIZ ScummVM backend are made in
 line with main official releases and are avalalble from the ScummVM
 downloads page <http://www.scummvm.org/downloads.php>.
 
-This build is in an active state of development and as such no
-"expected" behavior can be guaranteed ;).
-
-SVN builds are quickly tested with firmware 1.0.0 for reference.
-
 Please refer to the GP2X/GP2X WIZ ScummVM forum
 <http://forums.scummvm.org/viewforum.php?f=14> and WiKi
 <http://wiki.scummvm.org/index.php/GP2X> for the latest information on
@@ -111,16 +101,15 @@
 
 NOTE: To use button combos press and hold the Left Trigger then...
 
-Right Trigger: 0 (For skipping the copy protection in Monkey Island 2)
+Right Trigger: Display Virtual Keyboard 
+  (or if it VKeybd is disabled 0 (For skipping the copy protection in Monkey Island 2)
 Menu: Bring up the Global main menu for ScummVM
 Select: Exit ScummVM completely (and gracefully)
 
 ------------------------------------------------------------------------
 Know issues
 
-Possible random crash (well SegFault). I have had this happen twice and
-have not tracked down the cause.
-It happens very infrequently, both times it was in the DOTT CD intro.
+No major known issues
 
 ------------------------------------------------------------------------
 Additional resources/links

Modified: scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/bundle.sh
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/bundle.sh	2009-07-27 18:05:16 UTC (rev 42847)
+++ scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/bundle.sh	2009-07-27 18:06:41 UTC (rev 42848)
@@ -8,7 +8,9 @@
 mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves"
 mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins"
 mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data"
+mkdir "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib"
 
+
 echo "Please put your save games in this dir" >> "scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
 
 cp ./scummvm.gpe ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
@@ -27,6 +29,13 @@
 cp ../../../../dists/engine-data/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data
 cp ../../../../plugins/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins
 
+# Copy over dynamic libs needed by the app (as the ones in the default filesystem are broken).
+f=`which arm-open2x-linux-g++`
+loc=`dirname "$f"`
+cp $loc/../lib/libz.so.1.2.3 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libz.so.1
+cp $loc/../lib/libvorbisidec.so.1.0.2 ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/lib/libvorbisidec.so.1
+
+
 echo Making Stripped exe.
 arm-open2x-linux-strip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/scummvm.wiz
 

Modified: scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/scummvm.gpe
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/scummvm.gpe	2009-07-27 18:05:16 UTC (rev 42847)
+++ scummvm/branches/branch-1-0-0/backends/platform/gp2xwiz/build/scummvm.gpe	2009-07-27 18:06:41 UTC (rev 42848)
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# Export the location of any libs ScummVM depends on
+# (to avoid installing to the NAND and overwriting the broken ones there).
+export LD_LIBRARY_PATH=`pwd`/lib:$LD_LIBRARY_PATH
+
 # Run ScummVM, important this bit.
 ./scummvm.wiz --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc 
 


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