From 8e35049c9eff4eb1dc326e9d7f9c2805bc1e4a4c Mon Sep 17 00:00:00 2001
From: John Willis
Date: Thu, 5 Jul 2007 14:35:35 +0000
Subject: Tidy up of the GP2X config.sh and bundle.sh scripts. Add support for
 libMPEG2 (software YV12 for now). Now needs the latest test Open2x lib pack
 to build
 (http://wiki.open2x.org/open2x/wiki/index.php?title=Prebuilt_Library_Packages#Test_Releases).

svn-id: r27922
---
 backends/platform/gp2x/build/bundle.sh | 7 ++++---
 backends/platform/gp2x/build/config.sh | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backends/platform/gp2x/build/bundle.sh b/backends/platform/gp2x/build/bundle.sh
index cdadaa8116..526742e2e7 100644
--- a/backends/platform/gp2x/build/bundle.sh
+++ b/backends/platform/gp2x/build/bundle.sh
@@ -36,13 +36,14 @@ arm-open2x-linux-strip ./scummvm-gp2x-`date '+%Y-%m-%d'`/scummvm.gp2x
 echo Building ZIP bundle.
 if [ -f /usr/bin/zip ]
 	then
+		rm ./"gp2xkernel-open2x-`date '+%Y-%m-%d'`.zip"
 		cd "scummvm-gp2x-`date '+%Y-%m-%d'`"
-		zip "../scummvm-gp2x-`date '+%Y-%m-%d'`.zip" * -r -9
+		zip -r -9 "../scummvm-gp2x-`date '+%Y-%m-%d'`.zip" *
 		echo You should have a "scummvm-gp2x-`date '+%Y-%m-%d'`.zip" for the GP2X port ready to go.
-		echo All included files can also be found in ./"scummvm-gp2x-`date '+%Y-%m-%d'`"
+		cd ..
+		rm -R ./"scummvm-gp2x-`date '+%Y-%m-%d'`"
 	else  
 		echo - /usr/bin/zip not found, ZIP bundle not created.
 		echo All included files can also be found in ./"scummvm-gp2x-`date '+%Y-%m-%d'`"
 		echo - Please use you preferred archive tool to bundle these files.
 fi
-
diff --git a/backends/platform/gp2x/build/config.sh b/backends/platform/gp2x/build/config.sh
index 193210a1b8..f899c7665a 100644
--- a/backends/platform/gp2x/build/config.sh
+++ b/backends/platform/gp2x/build/config.sh
@@ -17,6 +17,6 @@ export DEFINES=-DNDEBUG
 
 # Edit the configure line to suit.
 cd ../../../..
-./configure --backend=gp2x --disable-mt32emu --host=gp2x --disable-mpeg2 --disable-flac  --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6
+./configure --backend=gp2x --disable-mt32emu --host=gp2x --disable-flac  --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6
 
 echo Generating config for GP2X complete. Check for errors.
-- 
cgit v1.2.3