[Scummvm-cvs-logs] SF.net SVN: scummvm:[52400] scummvm/trunk/backends/platform/gp2xwiz
djwillis at users.sourceforge.net
djwillis at users.sourceforge.net
Thu Aug 26 13:24:26 CEST 2010
Revision: 52400
http://scummvm.svn.sourceforge.net/scummvm/?rev=52400&view=rev
Author: djwillis
Date: 2010-08-26 11:24:26 +0000 (Thu, 26 Aug 2010)
Log Message:
-----------
GP2XWIZ: Add initial support for the GPH Caanoo.
Most of the codebase is the same, but the toolchain and libs are different.
Support for Caanoo specific features will follow, I just want to get the build support into trunk for now.
Modified Paths:
--------------
scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-main.cpp
Added Paths:
-----------
scummvm/trunk/backends/platform/gp2xwiz/caanoo/
scummvm/trunk/backends/platform/gp2xwiz/caanoo/build.sh
scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle-debug.sh
scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle.sh
scummvm/trunk/backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk
scummvm/trunk/backends/platform/gp2xwiz/caanoo/clean.sh
scummvm/trunk/backends/platform/gp2xwiz/caanoo/config-alleng.sh
scummvm/trunk/backends/platform/gp2xwiz/caanoo/config.sh
scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe
scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm.gpe
Added: scummvm/trunk/backends/platform/gp2xwiz/caanoo/build.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/caanoo/build.sh (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/caanoo/build.sh 2010-08-26 11:24:26 UTC (rev 52400)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo Quick script to make building all the time less painful.
+
+# Set the paths up here to support the build.
+
+cd ../../../..
+
+echo Building ScummVM for GP2X Caanoo.
+make
+
+echo Build for GP2X Caanoo - complete - Please check build logs.
Property changes on: scummvm/trunk/backends/platform/gp2xwiz/caanoo/build.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/x-sh
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ LF
Added: scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle-debug.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle-debug.sh (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle-debug.sh 2010-08-26 11:24:26 UTC (rev 52400)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo Quick script to make building a distribution of the GP2X Caanoo backend more consistent.
+
+cd ../../../..
+
+echo Building ScummVM for GP2X Caanoo.
+
+make caanoo-bundle-debug
Property changes on: scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle-debug.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/x-sh
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ LF
Added: scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle.sh (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle.sh 2010-08-26 11:24:26 UTC (rev 52400)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo Quick script to make building a distribution of the GP2X Caanoo backend more consistent.
+
+cd ../../../..
+
+echo Building ScummVM for GP2X Caanoo.
+
+make caanoo-bundle
Property changes on: scummvm/trunk/backends/platform/gp2xwiz/caanoo/bundle.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/x-sh
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ LF
Added: scummvm/trunk/backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk 2010-08-26 11:24:26 UTC (rev 52400)
@@ -0,0 +1,67 @@
+# Special target to create bundles for the GP2X Caanoo.
+
+#bundle_name = release/scummvm-caanoo-`date '+%Y-%m-%d'`
+bundle_name = release/scummvm-caanoo
+f=$(shell which $(STRIP))
+libloc = $(shell dirname $(f))
+
+caanoo-bundle: $(EXECUTABLE)
+ $(MKDIR) "$(bundle_name)"
+ $(MKDIR) "$(bundle_name)/scummvm"
+ $(MKDIR) "$(bundle_name)/scummvm/saves"
+ $(MKDIR) "$(bundle_name)/scummvm/engine-data"
+ $(MKDIR) "$(bundle_name)/scummvm/lib"
+
+ echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
+
+ $(CP) $(srcdir)/backends/platform/gp2xwiz/caanoo/scummvm.gpe $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/README-CAANOO
+ $(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/
+
+ $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+ $(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
+ $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+
+ $(STRIP) $(EXECUTABLE) -o $(bundle_name)/scummvm/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+ $(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+ $(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+ $(STRIP) $(bundle_name)/scummvm/plugins/*
+endif
+
+ tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 .
+ rm -R ./$(bundle_name)
+
+caanoo-bundle-debug: $(EXECUTABLE)
+ $(MKDIR) "$(bundle_name)"
+ $(MKDIR) "$(bundle_name)/scummvm"
+ $(MKDIR) "$(bundle_name)/scummvm/saves"
+ $(MKDIR) "$(bundle_name)/scummvm/engine-data"
+ $(MKDIR) "$(bundle_name)/scummvm/lib"
+
+ echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
+
+ $(CP) $(srcdir)/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+ $(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/README-CAANOO
+ $(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.ini $(bundle_name)/
+
+ $(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
+ $(INSTALL) -c -m 644 $(DIST_FILES_ENGINEDATA) $(bundle_name)/scummvm/engine-data
+ $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip $(bundle_name)/scummvm/
+
+ $(INSTALL) -c -m 777 $(srcdir)/$(EXECUTABLE) $(bundle_name)/scummvm/$(EXECUTABLE)
+
+ifdef DYNAMIC_MODULES
+ $(INSTALL) -d "$(bundle_name)/scummvm/plugins"
+ $(INSTALL) -c -m 644 $(PLUGINS) "$(bundle_name)/scummvm/plugins"
+endif
+
+ tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 .
+ rm -R ./$(bundle_name)
+
+.PHONY: caanoo-bundle caanoo-bundle-debug
Property changes on: scummvm/trunk/backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: scummvm/trunk/backends/platform/gp2xwiz/caanoo/clean.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/caanoo/clean.sh (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/caanoo/clean.sh 2010-08-26 11:24:26 UTC (rev 52400)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo Quick script to make building all the time less painful.
+
+cd ../../../..
+
+echo Cleaning ScummVM for the GP2X Wiz.
+make clean
Property changes on: scummvm/trunk/backends/platform/gp2xwiz/caanoo/clean.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/x-sh
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ LF
Added: scummvm/trunk/backends/platform/gp2xwiz/caanoo/config-alleng.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/caanoo/config-alleng.sh (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/caanoo/config-alleng.sh 2010-08-26 11:24:26 UTC (rev 52400)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo Quick script to make running configure all the time less painful
+echo and let all the build work be done from the backend/build folder.
+
+# Assume Caanoo toolchain/build env.
+. /opt/arm-caanoo/environment-setup
+
+# Export the tool names for cross-compiling
+export DEFINES=-DNDEBUG
+
+# Edit the configure line to suit.
+cd ../../../..
+./configure --backend=caanoo --disable-mt32emu --host=caanoo --disable-alsa --disable-flac --disable-nasm --disable-vorbis --disable-hq-scalers --with-sdl-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr/bin --with-mpeg2-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-tremor --with-tremor-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-zlib --with-zlib-prefix=/usr/local/angstrom/arm/arm-angstrom-linux-gnueabi/usr --enable-mad --with-mad-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-all-engines --enable-vkeybd --enable-plugins --default-dynamic
+
+echo Generating config for GP2X Caanoo complete. Check for errors.
Property changes on: scummvm/trunk/backends/platform/gp2xwiz/caanoo/config-alleng.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/x-sh
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ LF
Added: scummvm/trunk/backends/platform/gp2xwiz/caanoo/config.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/caanoo/config.sh (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/caanoo/config.sh 2010-08-26 11:24:26 UTC (rev 52400)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo Quick script to make running configure all the time less painful
+echo and let all the build work be done from the backend/build folder.
+
+# Assume Caanoo toolchain/build env.
+. /opt/arm-caanoo/environment-setup
+
+# Export the tool names for cross-compiling
+export DEFINES=-DNDEBUG
+
+# Edit the configure line to suit.
+cd ../../../..
+./configure --backend=caanoo --disable-mt32emu --host=caanoo --disable-alsa --disable-flac --disable-nasm --disable-vorbis --disable-hq-scalers --with-sdl-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr/bin --with-mpeg2-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-tremor --with-tremor-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-zlib --with-zlib-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-mad --with-mad-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr --enable-vkeybd --enable-plugins --default-dynamic
+
+echo Generating config for GP2X Caanoo complete. Check for errors.
Property changes on: scummvm/trunk/backends/platform/gp2xwiz/caanoo/config.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/x-sh
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ LF
Added: scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe 2010-08-26 11:24:26 UTC (rev 52400)
@@ -0,0 +1,16 @@
+#!/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 via GDB (so make sure you have a terminal open or serial).
+# Oh, and GDB installed of course ;)
+gdb --args ./scummvm.caanoo --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc
+
+# Sync the SD card to check that everything is written.
+sync
+
+# Return to the GPH menu screen
+cd /usr/gp2x
+exec /usr/gp2x/gp2xmenu
Property changes on: scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm.gpe
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm.gpe (rev 0)
+++ scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm.gpe 2010-08-26 11:24:26 UTC (rev 52400)
@@ -0,0 +1,15 @@
+#!/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.caanoo --fullscreen --gfx-mode=1x --config=$(pwd)/.scummvmrc
+
+# Sync the SD card to check that everything is written.
+sync
+
+# Return to the GPH menu screen
+cd /usr/gp2x
+exec /usr/gp2x/gp2xmenu
Property changes on: scummvm/trunk/backends/platform/gp2xwiz/caanoo/scummvm.gpe
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-main.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-main.cpp 2010-08-26 11:01:08 UTC (rev 52399)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-main.cpp 2010-08-26 11:24:26 UTC (rev 52400)
@@ -56,25 +56,20 @@
/* Dump console info to files. */
#define DUMP_STDOUT
-// Don't use the GP2XWiz main on the Caanoo
-#ifndef CAANOO
- int main(int argc, char *argv[]) {
+int main(int argc, char *argv[]) {
+ g_system = new OSystem_GP2XWIZ();
+ assert(g_system);
+#ifdef DYNAMIC_MODULES
+ PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
+#endif
- g_system = new OSystem_GP2XWIZ();
- assert(g_system);
+ // Invoke the actual ScummVM main entry point:
+ int res = scummvm_main(argc, argv);
+ g_system->quit();
- #ifdef DYNAMIC_MODULES
- PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
- #endif
+ return res;
+}
- // Invoke the actual ScummVM main entry point:
- int res = scummvm_main(argc, argv);
- g_system->quit();
-
- return res;
- }
-#endif /* CAANOO */
-
void OSystem_GP2XWIZ::initBackend() {
/* Setup default save path to be workingdir/saves */
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