GPH: Add separate button defined buttons for each supported device.

* No default buttons set any more as I would want the build to fails
  if you don't provide the backend with a device.

* Also commit some small cleanup to the bundle files.

3 files changed, 17 insertions, 2 deletions

diff --git a/backends/platform/gp2x/build/bundle.sh b/backends/platform/gp2x/build/bundle.sh
index d17f8bd831..c4fe63ed9e 100755
--- a/backends/platform/gp2x/build/bundle.sh
+++ b/backends/platform/gp2x/build/bundle.sh
@@ -2,9 +2,18 @@
 
 echo Quick script to make building a distribution of the GP2X port more consistent.
 
+# Set the paths up here to support the build.
+
+export PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
+export PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
+export CXX=arm-open2x-linux-g++
+export CC=arm-open2x-linux-gcc
+export CXXFLAGS=-march=armv4t
+export LDFLAGS=-static
+export ASFLAGS=-mfloat-abi=soft
+
 cd ../../../..
 
 echo Building ScummVM for GP2X Wiz.
 
 make gp2x-bundle
-
diff --git a/backends/platform/gph/gp2x-bundle.mk b/backends/platform/gph/gp2x-bundle.mk
index 67d22d1889..18c1483aba 100644
--- a/backends/platform/gph/gp2x-bundle.mk
+++ b/backends/platform/gph/gp2x-bundle.mk
@@ -1,11 +1,14 @@
 # Special target to create bundles for the GP2X.
 
 bundle_name = release/scummvm-gp2x
+f=$(shell which $(STRIP))
+libloc = $(shell dirname $(f))
 
 gp2x-bundle: $(EXECUTABLE)
 	$(MKDIR) "$(bundle_name)"
 	$(MKDIR) "$(bundle_name)/saves"
 	$(MKDIR) "$(bundle_name)/engine-data"
+	$(MKDIR) "$(bundle_name)/lib"
 
 	echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
 
@@ -27,6 +30,8 @@ ifdef DYNAMIC_MODULES
 	$(STRIP) $(bundle_name)/plugins/*
 endif
 
+	$(CP) $(libloc)/../arm-open2x-linux/lib/libdl.so $(bundle_name)/lib/libdl.so
+
 	tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
 	rm -R ./$(bundle_name)
 
@@ -54,6 +59,8 @@ ifdef DYNAMIC_MODULES
 	$(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
 endif
 
+	$(CP) $(libloc)/../arm-open2x-linux/lib/libdl.so $(bundle_name)/lib/libdl.so
+
 	tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
 	rm -R ./$(bundle_name)
 
diff --git a/backends/platform/gph/gp2xwiz-bundle.mk b/backends/platform/gph/gp2xwiz-bundle.mk
index df4cae7f4f..630857f9da 100755
--- a/backends/platform/gph/gp2xwiz-bundle.mk
+++ b/backends/platform/gph/gp2xwiz-bundle.mk
@@ -1,6 +1,5 @@
 # Special target to create bundles for the GP2X Wiz.
 
-#bundle_name = release/scummvm-wiz-`date '+%Y-%m-%d'`
 bundle_name = release/scummvm-gp2xwiz
 f=$(shell which $(STRIP))
 libloc = $(shell dirname $(f))