[Scummvm-cvs-logs] scummvm master -> e2adf5babcc7c04368fbb5c9fb8df170bbfdd7d0

djwillis John.Willis at Distant-earth.com
Tue Apr 12 11:46:23 CEST 2011


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
15bdb29248 GPH: Add separate button defined buttons for each supported device.
e2adf5babc GPH/GP2X: Tweak wrapper script to export LD_LIBRARY_PATH.


Commit: 15bdb29248db3acc5408dacc2bc696e0904d6869
    https://github.com/scummvm/scummvm/commit/15bdb29248db3acc5408dacc2bc696e0904d6869
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-12T02:44:04-07:00

Commit Message:
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.

Changed paths:
    backends/events/gph/gph-events.cpp
    backends/platform/gp2x/build/bundle.sh
    backends/platform/gph/gp2x-bundle.mk
    backends/platform/gph/gp2xwiz-bundle.mk



diff --git a/backends/events/gph/gph-events.cpp b/backends/events/gph/gph-events.cpp
index 46ab946..d2b3483 100644
--- a/backends/events/gph/gph-events.cpp
+++ b/backends/events/gph/gph-events.cpp
@@ -78,7 +78,9 @@ int BUTTON_STATE_L					=	false;
 		BUTTON_SELECT		= 62
 	};
 
-#else
+#endif
+
+#if defined(GP2XWIZ)
 
 	/* Wiz: Main Joystick Mappings */
 	enum {
@@ -115,6 +117,42 @@ int BUTTON_STATE_L					=	false;
 
 #endif
 
+#if defined(GP2X)
+
+enum {
+	/* DPAD/Stick */
+	BUTTON_UP			= 0,
+	BUTTON_UPLEFT		= 1,
+	BUTTON_LEFT			= 2,
+	BUTTON_DOWNLEFT		= 3,
+	BUTTON_DOWN			= 4,
+	BUTTON_DOWNRIGHT	= 5,
+	BUTTON_RIGHT		= 6,
+	BUTTON_UPRIGHT		= 7,
+	/* Joystick Buttons */
+	BUTTON_MENU			= 8,	// Start on F100 GP2X
+	BUTTON_SELECT		= 9,
+	BUTTON_L			= 10,
+	BUTTON_R			= 11,
+	BUTTON_A			= 12,
+	BUTTON_B			= 13,
+	BUTTON_X			= 14,
+	BUTTON_Y			= 15,
+	BUTTON_VOLUP		= 16,
+	BUTTON_VOLDOWN		= 17,
+	BUTTON_CLICK		= 18
+};
+
+enum {
+	/* Unused Joystick Buttons on the GP2X */
+	BUTTON_HOME			= 51,
+	BUTTON_HOLD			= 52,
+	BUTTON_HELP			= 53,
+	BUTTON_HELP2		= 54
+};
+
+#endif
+
 enum {
 	/* Touchscreen TapMode */
 	TAPMODE_LEFT		= 0,
diff --git a/backends/platform/gp2x/build/bundle.sh b/backends/platform/gp2x/build/bundle.sh
index d17f8bd..c4fe63e 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 67d22d1..18c1483 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 df4cae7..630857f 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))


Commit: e2adf5babcc7c04368fbb5c9fb8df170bbfdd7d0
    https://github.com/scummvm/scummvm/commit/e2adf5babcc7c04368fbb5c9fb8df170bbfdd7d0
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-12T02:44:05-07:00

Commit Message:
GPH/GP2X: Tweak wrapper script to export LD_LIBRARY_PATH.

Changed paths:
    backends/platform/gp2x/build/scummvm.gpe



diff --git a/backends/platform/gp2x/build/scummvm.gpe b/backends/platform/gp2x/build/scummvm.gpe
index c6b0518..e8983aa 100755
--- a/backends/platform/gp2x/build/scummvm.gpe
+++ b/backends/platform/gp2x/build/scummvm.gpe
@@ -3,6 +3,10 @@
 # Remount SD with forced Sync, does this really work?
 mount -o sync,remount /dev/mmcsd/disc0/part1 /mnt/sd/
 
+# 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.gph
 






More information about the Scummvm-git-logs mailing list