[Scummvm-cvs-logs] scummvm master -> 1986c1d82b83ea7a8a510e12ca7e78127de1da80
djwillis
John.Willis at Distant-earth.com
Wed Apr 13 09:04:22 CEST 2011
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
cb3e3e7125 GP2X: Move build support files into the GPH backend.
da688dbb7f GPH: Move caanoo build support files into device folder in the backend.
a18bb2e73d GPH: Move GP2XWIZ build support files into devices folder.
1986c1d82b CONFIGURE: Add _timidity=no to the GPH devices to stop Timidity
Commit: cb3e3e7125274dba4437f0beb35b461405eb3442
https://github.com/scummvm/scummvm/commit/cb3e3e7125274dba4437f0beb35b461405eb3442
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-13T00:01:15-07:00
Commit Message:
GP2X: Move build support files into the GPH backend.
Changed paths:
A backends/platform/gph/build/gp2x-build.sh
A backends/platform/gph/build/gp2x-bundle.sh
A backends/platform/gph/build/gp2x-config-alleng.sh
A backends/platform/gph/build/gp2x-config.sh
A backends/platform/gph/devices/gp2x/mmuhack/Makefile
A backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.h
A backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.s
A backends/platform/gph/devices/gp2x/mmuhack/mmuhack.c
A backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o
A backends/platform/gph/devices/gp2x/mmuhack/readme.txt
A backends/platform/gph/devices/gp2x/scummvm.gpe
R backends/platform/gp2x/build/README-GP2X
R backends/platform/gp2x/build/scummvm.png
R backends/platform/gp2x/build/build.sh
R backends/platform/gp2x/build/bundle.sh
R backends/platform/gp2x/build/config-alleng.sh
R backends/platform/gp2x/build/config.sh
R backends/platform/gp2x/mmuhack/Makefile
R backends/platform/gp2x/mmuhack/flush_uppermem_cache.h
R backends/platform/gp2x/mmuhack/flush_uppermem_cache.s
R backends/platform/gp2x/mmuhack/mmuhack.c
R backends/platform/gp2x/build/mmuhack.o
R backends/platform/gp2x/mmuhack/readme.txt
R backends/platform/gp2x/build/scummvm.gpe
backends/platform/gph/gp2x-bundle.mk
diff --git a/backends/platform/gp2x/build/README-GP2X b/backends/platform/gp2x/build/README-GP2X
deleted file mode 100644
index 3c6591d..0000000
--- a/backends/platform/gp2x/build/README-GP2X
+++ /dev/null
@@ -1,54 +0,0 @@
-ScummVM - GP2X SPECIFIC README
-------------------------------------------------------------------------
-
-Contents:
-
- * About the backend/port <#About_the_backendport>
- * Supported audio options <#Supported_audio_options>
- * Credits <#Credits>
-
-------------------------------------------------------------------------
-
-Please refer to the:
-
-GP2X/GP2XWiz ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14>
-WiKi: <http://wiki.scummvm.org/index.php/GP2X>
-
-for the most current information on the port and any updates to this
-documentation.
-
-The wiki includes detailed instructions on how to use the port and
-control information.
-
-------------------------------------------------------------------------
-About the backend/port
-
-This is the readme for the official GP2X ScummVM backend (also known as
-the GP2X port).
-
-This is an SVN test release of ScummVM for the GP2X, 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 ScummVM backend are made in
-line with main official releases and are avalalble from the ScummVM
-downloads page <http://www.scummvm.org/downloads.php>.
-
-------------------------------------------------------------------------
-Supported audio options
-
-Raw audio.
-MP3 audio.
-OGG Vorbis audio.
-
-FLAC audio is currently unsupported.
-
-For best results use uncompressed audio in games.
-
-------------------------------------------------------------------------
-Credits
-
-Core ScummVM code (c) The ScummVM Team
-Portions of the GP2X backend (c) John Willis
-Detailed (c) information can be found within the source code
diff --git a/backends/platform/gp2x/build/build.sh b/backends/platform/gp2x/build/build.sh
deleted file mode 100755
index 1ea77f4..0000000
--- a/backends/platform/gp2x/build/build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-echo Quick script to make building all the time less painful.
-
-# 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.
-make
-
-echo Build for GP2X - SDL - complete - Please check build logs.
diff --git a/backends/platform/gp2x/build/bundle.sh b/backends/platform/gp2x/build/bundle.sh
deleted file mode 100755
index c4fe63e..0000000
--- a/backends/platform/gp2x/build/bundle.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-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/gp2x/build/config-alleng.sh b/backends/platform/gp2x/build/config-alleng.sh
deleted file mode 100755
index 4a3526d..0000000
--- a/backends/platform/gp2x/build/config-alleng.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-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.
-
-# Set the paths up here to generate the config.
-
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
-
-# Export the tool names for cross-compiling
-export CXX=arm-open2x-linux-g++
-export CXXFLAGS=-march=armv4t
-export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
-export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
-export DEFINES=-DNDEBUG
-
-# Edit the configure line to suit.
-cd ../../../..
-./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 --enable-all-engines --enable-vkeybd
-#--enable-plugins --default-dynamic
-
-echo Generating config for GP2X complete. Check for errors.
diff --git a/backends/platform/gp2x/build/config.sh b/backends/platform/gp2x/build/config.sh
deleted file mode 100755
index e0a1bf1..0000000
--- a/backends/platform/gp2x/build/config.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-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.
-
-# Set the paths up here to generate the config.
-
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
-
-# Export the tool names for cross-compiling
-export CXX=arm-open2x-linux-g++
-export CXXFLAGS=-march=armv4t
-export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
-export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
-export DEFINES=-DNDEBUG
-
-# Edit the configure line to suit.
-cd ../../../..
-./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 --enable-vkeybd
-# --disable-release --enable-debug
-# --enable-plugins --default-dynamic
-
-echo Generating config for GP2X complete. Check for errors.
diff --git a/backends/platform/gp2x/build/mmuhack.o b/backends/platform/gp2x/build/mmuhack.o
deleted file mode 100644
index 475f4a5..0000000
Binary files a/backends/platform/gp2x/build/mmuhack.o and /dev/null differ
diff --git a/backends/platform/gp2x/build/scummvm.gpe b/backends/platform/gp2x/build/scummvm.gpe
deleted file mode 100755
index e8983aa..0000000
--- a/backends/platform/gp2x/build/scummvm.gpe
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# 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
-
-# Sync the SD card to check that everything is written.
-sync
-
-# Return to the GPH menu screen
-cd /usr/gp2x
-exec /usr/gp2x/gp2xmenu
diff --git a/backends/platform/gp2x/build/scummvm.png b/backends/platform/gp2x/build/scummvm.png
deleted file mode 100644
index 128e59e..0000000
Binary files a/backends/platform/gp2x/build/scummvm.png and /dev/null differ
diff --git a/backends/platform/gp2x/mmuhack/Makefile b/backends/platform/gp2x/mmuhack/Makefile
deleted file mode 100644
index a35d5c2..0000000
--- a/backends/platform/gp2x/mmuhack/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-TARGET = mmuhack
-INCLUDE = -I/opt/gcc-3.4.4-glibc-2.3.6/arm-open2x-linux/sys-include
-CFLAGS = -O2 -DMODULE -D__KERNEL__ ${INCLUDE}
-CC = arm-open2x-linux-gcc
-
-all: ${TARGET}.o
-
-${TARGET}.o: ${TARGET}.c
-
-clean:
- rm -rf ${TARGET}.o
diff --git a/backends/platform/gp2x/mmuhack/flush_uppermem_cache.h b/backends/platform/gp2x/mmuhack/flush_uppermem_cache.h
deleted file mode 100644
index 520841a..0000000
--- a/backends/platform/gp2x/mmuhack/flush_uppermem_cache.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-void flush_uppermem_cache(void *start_address, void *end_address, int flags);
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/backends/platform/gp2x/mmuhack/flush_uppermem_cache.s b/backends/platform/gp2x/mmuhack/flush_uppermem_cache.s
deleted file mode 100644
index 17628c1..0000000
--- a/backends/platform/gp2x/mmuhack/flush_uppermem_cache.s
+++ /dev/null
@@ -1,6 +0,0 @@
-.global flush_uppermem_cache @ void *start_address, void *end_address, int flags
-
-flush_uppermem_cache:
- swi #0x9f0002
- bx lr
-
diff --git a/backends/platform/gp2x/mmuhack/mmuhack.c b/backends/platform/gp2x/mmuhack/mmuhack.c
deleted file mode 100644
index 7e27262..0000000
--- a/backends/platform/gp2x/mmuhack/mmuhack.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/miscdevice.h>
-#include <asm/memory.h>
-
-#define MMUHACK_MINOR 225
-#define DEVICE_NAME "mmuhack"
-
-#if __GNUC__ == 3
-#include <linux/version.h>
-static const char __module_kernel_version_gcc3[] __attribute__((__used__)) __attribute__((section(".modinfo"))) =
-"kernel_version=" UTS_RELEASE;
-#endif
-
-static ssize_t mmuhack_open(struct inode *inode, struct file *filp)
-{
- unsigned int *pgtable;
- unsigned int *cpt;
- int i, j;
- int ttb;
- int ret = -EFAULT;
-
- // get the pointer to the translation table base...
- asm volatile(
- "stmdb sp!, {r0}\n\t"
- "mrc p15, 0, r0, c2, c0, 0\n\t"
- "mov %0, r0\n\t"
- "ldmia sp!, {r0}\n\t": "=r"(ttb)
- );
-
- pgtable = __va(ttb);
-
- for (i = 0; i < 4096; i ++) if ( (pgtable[i] & 3) == 1 ) {
- cpt = __va(pgtable[i] & 0xfffffc00);
-
- for (j = 0; j < 256; j ++) {/*
- if ( (cpt[j] & 0xfe00000f) == 0x02000002 ) {
- // set C and B bits in upper 32MB memory area...
- printk("Set C&B bits %08x\n",cpt[j]);
- cpt[j] |= 0xFFC;
- ret = 0;
- }
- */
- if (((cpt[j] & 0xff000000) == 0x02000000) && ((cpt[j] & 12)==0) )
- {
- //printk("Set C&B bits %08x\n",cpt[j]);
- cpt[j] |= 0xFFC;
- }
- //if ((a>=0x31 && a<=0x36) && ((cpt[i] & 12)==0))
- if (((cpt[j] & 0xff000000) == 0x03000000) && ((cpt[j] & 12)==0))
- {
- //printk("Set C&B bits %08x\n",cpt[j]);
- //printf("SDL c and b bits not set, overwriting\n");
- cpt[j] |= 0xFFC;
- }
- }
- }
-
- // drain the write buffer and flush the tlb caches...
- asm volatile(
- "stmdb sp!, {r0}\n\t"
- "mov r0, #0\n\t"
- "mcr 15, 0, r0, cr7, cr10, 4\n\t"
- "mcr 15, 0, r0, cr8, cr7, 0\n\t"
- "ldmia sp!, {r0}\n\t"
- );
-
- if (ret == 0)
- printk("MMU hack applied.\n");
-
- return 0;
-}
-
-static struct file_operations mmuhack_fops = {
- owner: THIS_MODULE,
- open: mmuhack_open,
-};
-
-
-static struct miscdevice mmuhack = {
- MMUHACK_MINOR, DEVICE_NAME, &mmuhack_fops
-};
-
-static int __init mmuhack_init(void)
-{
- misc_register(&mmuhack);
-/*
- printk("MMSP2 MMU Hack module.\n");
-*/
- return 0;
-}
-
-static void __exit mmuhack_exit(void)
-{
- misc_deregister(&mmuhack);
-/*
- printk(KERN_ALERT "MMU Hack module removed.\n");
-*/
-}
-
-module_init(mmuhack_init);
-module_exit(mmuhack_exit);
diff --git a/backends/platform/gp2x/mmuhack/readme.txt b/backends/platform/gp2x/mmuhack/readme.txt
deleted file mode 100644
index bea49d7..0000000
--- a/backends/platform/gp2x/mmuhack/readme.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-About
------
-
-This is a module for GP2X 2.4 based Linux kernel, created for developers to use in their
-programs.
-
-Normally the upper 32MB is uncached. This means that reads/writes on the memory
-are always done via the physical memory modules rather than the much faster
-memory built into the processor (called 'cache'). Access to the upper 32MB can
-be sped up by Squidge's MMU hack. The easiest way to use the MMU hack is to add
-and load the MMU hack kernel module into your program.
-
-Note: Building this module requries a GP2X 'kernel' toolchain (i.e. GCC 2.95.*
-for the GP2X stock, 3.* for Open2X).
-
-You can't build this module with the GCC 4 based application toolchains.
-
-Operation
----------
-
-When loaded into kernel, this module creates /dev/mmuhack device. Whenever
-a program opens that device using open() call, the module traverses all
-memory, which was allocated in 0x02000000-0x03ffffff range by the program via
-using mmap() system call. While doing that, it marks all encountered memory
-as bufferable and cacheable.
-
-The most common use of this is to remove the framebuffer access bottleneck.
-Note that, however, by making the framebuffer cacheable you can cause display
-artifacts. This can happen because parts of your framebuffer may stay in CPU
-cache and not to be written back to the physical memory. The display
-controller only fetches data from the physical memory, so you get incomplete
-image (the memory will most likely contain data from previous frame, so these
-artifacts are better visible during fade effects). The easy way to fix this
-is by using a special ARM Linux system call, which flushes the cache (forces
-the CPU to write data in cache to the physical memory (see section "Flushing
-the cache")).
-
-Using this module affects the whole upper memory area. But in some situations
-this may be not desirable, for example when using ARM940 core in your program
-(ether using 940 libraries like ogg940 and gpu940, or using your custom code,
-which needs uncacheable memory for communication and such). If you need part
-of your upper memory to be cached, and other part not, you should mmap() that
-memory (which you want to be uncached) _after_ doing open("/dev/mmuhack").
-Another way is to modify mmuhack.c to suit your needs and rebuild the module.
-
-
-Usage
------
-
-The very first thing to do is to load the kernel module (mmuhack.o) into the
-running kernel. But before that you should try to unload mmuhack module,
-because other program might have left a different version loaded with
-different memory configuration, which may not suit your program.
-
-system("/sbin/rmmod mmuhack");
-system("/sbin/insmod mmuhack.o");
-
-Now you can assume the module is loaded into kernel and open /dev/mmuhack
-device. You don't need to worry about previous calls failing, because in that
-case open() will simply fail and nothing bad will happen.
-
-IMPORTANT: you _must_ do the open() call _after_ you initialize your graphics
-library or allocate your memory, because it can only work with memory which is
-already allocated, it won't affect memory you or your lib allocates after the
-open() call.
-
-int mmufd = open("/dev/mmuhack", O_RDWR);
-if(mmufd < 0)
-{
- printf("MMU hack failed");
-}
-else
-{
- printf("MMU hack loaded");
- close(mmufd);
-}
-
-If the above call succeeded, you are all done.
-I recommend to unload the module when your program exits, because the other
-program may want to load a different mmuhack.o and may fail, because you left
-your mmuhack.o loaded (it does not get unloaded automatically on exit).
-
-system("/sbin/rmmod mmuhack");
-
-
-Flushing the cache
-------------------
-
-If using mmuhack.o causes your program to display artifacts (see "Operation"
-section for explanation), you will need to flush the CPU cache. This should
-be done after finishing every frame and just before flipping your display
-buffer/surface. You will need to add flush_uppermem_cache.s file to your
-Makefile/project and add a call to flush_uppermem_cache() just before final
-framebuffer flip or blit.
-
-flush_uppermem_cache() has 3 parameters. First param is the start address,
-second param is the end address, third one should always be 0. The addresses
-should be virtual ones (most often pointers to the start/end of your
-framebuffer). Example:
-
-flush_uppermem_cache(screen_surface->pixels, screen_surface->pixels + 320*240, 0);
-
-
-Credits
--------
-
-Original idea/implementation: Squidge (this whole thing is also known as squidgehack)
-Kernel module: NK
-Documentation: notaz
-
diff --git a/backends/platform/gph/build/gp2x-build.sh b/backends/platform/gph/build/gp2x-build.sh
new file mode 100644
index 0000000..1ea77f4
--- /dev/null
+++ b/backends/platform/gph/build/gp2x-build.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+echo Quick script to make building all the time less painful.
+
+# 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.
+make
+
+echo Build for GP2X - SDL - complete - Please check build logs.
diff --git a/backends/platform/gph/build/gp2x-bundle.sh b/backends/platform/gph/build/gp2x-bundle.sh
new file mode 100644
index 0000000..c4fe63e
--- /dev/null
+++ b/backends/platform/gph/build/gp2x-bundle.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+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/build/gp2x-config-alleng.sh b/backends/platform/gph/build/gp2x-config-alleng.sh
new file mode 100644
index 0000000..4a3526d
--- /dev/null
+++ b/backends/platform/gph/build/gp2x-config-alleng.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+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.
+
+# Set the paths up here to generate the config.
+
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
+
+# Export the tool names for cross-compiling
+export CXX=arm-open2x-linux-g++
+export CXXFLAGS=-march=armv4t
+export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
+export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
+export DEFINES=-DNDEBUG
+
+# Edit the configure line to suit.
+cd ../../../..
+./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 --enable-all-engines --enable-vkeybd
+#--enable-plugins --default-dynamic
+
+echo Generating config for GP2X complete. Check for errors.
diff --git a/backends/platform/gph/build/gp2x-config.sh b/backends/platform/gph/build/gp2x-config.sh
new file mode 100644
index 0000000..9092b0b
--- /dev/null
+++ b/backends/platform/gph/build/gp2x-config.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+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.
+
+# Set the paths up here to generate the config.
+
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
+
+# Export the tool names for cross-compiling
+export CXX=arm-open2x-linux-g++
+export CXXFLAGS=-march=armv4t
+export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
+export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
+export DEFINES=-DNDEBUG
+
+# Edit the configure line to suit.
+cd ../../../..
+./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 --enable-vkeybd --enable-plugins --default-dynamic
+# --disable-release --enable-debug
+# --enable-plugins --default-dynamic
+
+echo Generating config for GP2X complete. Check for errors.
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/Makefile b/backends/platform/gph/devices/gp2x/mmuhack/Makefile
new file mode 100644
index 0000000..a35d5c2
--- /dev/null
+++ b/backends/platform/gph/devices/gp2x/mmuhack/Makefile
@@ -0,0 +1,11 @@
+TARGET = mmuhack
+INCLUDE = -I/opt/gcc-3.4.4-glibc-2.3.6/arm-open2x-linux/sys-include
+CFLAGS = -O2 -DMODULE -D__KERNEL__ ${INCLUDE}
+CC = arm-open2x-linux-gcc
+
+all: ${TARGET}.o
+
+${TARGET}.o: ${TARGET}.c
+
+clean:
+ rm -rf ${TARGET}.o
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.h b/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.h
new file mode 100644
index 0000000..520841a
--- /dev/null
+++ b/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.h
@@ -0,0 +1,11 @@
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void flush_uppermem_cache(void *start_address, void *end_address, int flags);
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.s b/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.s
new file mode 100644
index 0000000..17628c1
--- /dev/null
+++ b/backends/platform/gph/devices/gp2x/mmuhack/flush_uppermem_cache.s
@@ -0,0 +1,6 @@
+.global flush_uppermem_cache @ void *start_address, void *end_address, int flags
+
+flush_uppermem_cache:
+ swi #0x9f0002
+ bx lr
+
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.c b/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.c
new file mode 100644
index 0000000..7e27262
--- /dev/null
+++ b/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.c
@@ -0,0 +1,129 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/miscdevice.h>
+#include <asm/memory.h>
+
+#define MMUHACK_MINOR 225
+#define DEVICE_NAME "mmuhack"
+
+#if __GNUC__ == 3
+#include <linux/version.h>
+static const char __module_kernel_version_gcc3[] __attribute__((__used__)) __attribute__((section(".modinfo"))) =
+"kernel_version=" UTS_RELEASE;
+#endif
+
+static ssize_t mmuhack_open(struct inode *inode, struct file *filp)
+{
+ unsigned int *pgtable;
+ unsigned int *cpt;
+ int i, j;
+ int ttb;
+ int ret = -EFAULT;
+
+ // get the pointer to the translation table base...
+ asm volatile(
+ "stmdb sp!, {r0}\n\t"
+ "mrc p15, 0, r0, c2, c0, 0\n\t"
+ "mov %0, r0\n\t"
+ "ldmia sp!, {r0}\n\t": "=r"(ttb)
+ );
+
+ pgtable = __va(ttb);
+
+ for (i = 0; i < 4096; i ++) if ( (pgtable[i] & 3) == 1 ) {
+ cpt = __va(pgtable[i] & 0xfffffc00);
+
+ for (j = 0; j < 256; j ++) {/*
+ if ( (cpt[j] & 0xfe00000f) == 0x02000002 ) {
+ // set C and B bits in upper 32MB memory area...
+ printk("Set C&B bits %08x\n",cpt[j]);
+ cpt[j] |= 0xFFC;
+ ret = 0;
+ }
+ */
+ if (((cpt[j] & 0xff000000) == 0x02000000) && ((cpt[j] & 12)==0) )
+ {
+ //printk("Set C&B bits %08x\n",cpt[j]);
+ cpt[j] |= 0xFFC;
+ }
+ //if ((a>=0x31 && a<=0x36) && ((cpt[i] & 12)==0))
+ if (((cpt[j] & 0xff000000) == 0x03000000) && ((cpt[j] & 12)==0))
+ {
+ //printk("Set C&B bits %08x\n",cpt[j]);
+ //printf("SDL c and b bits not set, overwriting\n");
+ cpt[j] |= 0xFFC;
+ }
+ }
+ }
+
+ // drain the write buffer and flush the tlb caches...
+ asm volatile(
+ "stmdb sp!, {r0}\n\t"
+ "mov r0, #0\n\t"
+ "mcr 15, 0, r0, cr7, cr10, 4\n\t"
+ "mcr 15, 0, r0, cr8, cr7, 0\n\t"
+ "ldmia sp!, {r0}\n\t"
+ );
+
+ if (ret == 0)
+ printk("MMU hack applied.\n");
+
+ return 0;
+}
+
+static struct file_operations mmuhack_fops = {
+ owner: THIS_MODULE,
+ open: mmuhack_open,
+};
+
+
+static struct miscdevice mmuhack = {
+ MMUHACK_MINOR, DEVICE_NAME, &mmuhack_fops
+};
+
+static int __init mmuhack_init(void)
+{
+ misc_register(&mmuhack);
+/*
+ printk("MMSP2 MMU Hack module.\n");
+*/
+ return 0;
+}
+
+static void __exit mmuhack_exit(void)
+{
+ misc_deregister(&mmuhack);
+/*
+ printk(KERN_ALERT "MMU Hack module removed.\n");
+*/
+}
+
+module_init(mmuhack_init);
+module_exit(mmuhack_exit);
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o b/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o
new file mode 100644
index 0000000..475f4a5
Binary files /dev/null and b/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o differ
diff --git a/backends/platform/gph/devices/gp2x/mmuhack/readme.txt b/backends/platform/gph/devices/gp2x/mmuhack/readme.txt
new file mode 100644
index 0000000..bea49d7
--- /dev/null
+++ b/backends/platform/gph/devices/gp2x/mmuhack/readme.txt
@@ -0,0 +1,110 @@
+About
+-----
+
+This is a module for GP2X 2.4 based Linux kernel, created for developers to use in their
+programs.
+
+Normally the upper 32MB is uncached. This means that reads/writes on the memory
+are always done via the physical memory modules rather than the much faster
+memory built into the processor (called 'cache'). Access to the upper 32MB can
+be sped up by Squidge's MMU hack. The easiest way to use the MMU hack is to add
+and load the MMU hack kernel module into your program.
+
+Note: Building this module requries a GP2X 'kernel' toolchain (i.e. GCC 2.95.*
+for the GP2X stock, 3.* for Open2X).
+
+You can't build this module with the GCC 4 based application toolchains.
+
+Operation
+---------
+
+When loaded into kernel, this module creates /dev/mmuhack device. Whenever
+a program opens that device using open() call, the module traverses all
+memory, which was allocated in 0x02000000-0x03ffffff range by the program via
+using mmap() system call. While doing that, it marks all encountered memory
+as bufferable and cacheable.
+
+The most common use of this is to remove the framebuffer access bottleneck.
+Note that, however, by making the framebuffer cacheable you can cause display
+artifacts. This can happen because parts of your framebuffer may stay in CPU
+cache and not to be written back to the physical memory. The display
+controller only fetches data from the physical memory, so you get incomplete
+image (the memory will most likely contain data from previous frame, so these
+artifacts are better visible during fade effects). The easy way to fix this
+is by using a special ARM Linux system call, which flushes the cache (forces
+the CPU to write data in cache to the physical memory (see section "Flushing
+the cache")).
+
+Using this module affects the whole upper memory area. But in some situations
+this may be not desirable, for example when using ARM940 core in your program
+(ether using 940 libraries like ogg940 and gpu940, or using your custom code,
+which needs uncacheable memory for communication and such). If you need part
+of your upper memory to be cached, and other part not, you should mmap() that
+memory (which you want to be uncached) _after_ doing open("/dev/mmuhack").
+Another way is to modify mmuhack.c to suit your needs and rebuild the module.
+
+
+Usage
+-----
+
+The very first thing to do is to load the kernel module (mmuhack.o) into the
+running kernel. But before that you should try to unload mmuhack module,
+because other program might have left a different version loaded with
+different memory configuration, which may not suit your program.
+
+system("/sbin/rmmod mmuhack");
+system("/sbin/insmod mmuhack.o");
+
+Now you can assume the module is loaded into kernel and open /dev/mmuhack
+device. You don't need to worry about previous calls failing, because in that
+case open() will simply fail and nothing bad will happen.
+
+IMPORTANT: you _must_ do the open() call _after_ you initialize your graphics
+library or allocate your memory, because it can only work with memory which is
+already allocated, it won't affect memory you or your lib allocates after the
+open() call.
+
+int mmufd = open("/dev/mmuhack", O_RDWR);
+if(mmufd < 0)
+{
+ printf("MMU hack failed");
+}
+else
+{
+ printf("MMU hack loaded");
+ close(mmufd);
+}
+
+If the above call succeeded, you are all done.
+I recommend to unload the module when your program exits, because the other
+program may want to load a different mmuhack.o and may fail, because you left
+your mmuhack.o loaded (it does not get unloaded automatically on exit).
+
+system("/sbin/rmmod mmuhack");
+
+
+Flushing the cache
+------------------
+
+If using mmuhack.o causes your program to display artifacts (see "Operation"
+section for explanation), you will need to flush the CPU cache. This should
+be done after finishing every frame and just before flipping your display
+buffer/surface. You will need to add flush_uppermem_cache.s file to your
+Makefile/project and add a call to flush_uppermem_cache() just before final
+framebuffer flip or blit.
+
+flush_uppermem_cache() has 3 parameters. First param is the start address,
+second param is the end address, third one should always be 0. The addresses
+should be virtual ones (most often pointers to the start/end of your
+framebuffer). Example:
+
+flush_uppermem_cache(screen_surface->pixels, screen_surface->pixels + 320*240, 0);
+
+
+Credits
+-------
+
+Original idea/implementation: Squidge (this whole thing is also known as squidgehack)
+Kernel module: NK
+Documentation: notaz
+
diff --git a/backends/platform/gph/devices/gp2x/scummvm.gpe b/backends/platform/gph/devices/gp2x/scummvm.gpe
new file mode 100644
index 0000000..e8983aa
--- /dev/null
+++ b/backends/platform/gph/devices/gp2x/scummvm.gpe
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# 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
+
+# Sync the SD card to check that everything is written.
+sync
+
+# Return to the GPH menu screen
+cd /usr/gp2x
+exec /usr/gp2x/gp2xmenu
diff --git a/backends/platform/gph/gp2x-bundle.mk b/backends/platform/gph/gp2x-bundle.mk
index 18c1483..810ff8b 100644
--- a/backends/platform/gph/gp2x-bundle.mk
+++ b/backends/platform/gph/gp2x-bundle.mk
@@ -12,10 +12,10 @@ gp2x-bundle: $(EXECUTABLE)
echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
- $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.png $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/README-GP2X $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/mmuhack.o $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/gp2x/scummvm.gpe $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o $(bundle_name)/
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
@@ -42,10 +42,10 @@ gp2x-bundle-debug: $(EXECUTABLE)
echo "Please put your save games in this dir" >> "$(bundle_name)/saves/PUT_SAVES_IN_THIS_DIR"
- $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.gpe $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/scummvm.png $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/README-GP2X $(bundle_name)/
- $(CP) $(srcdir)/backends/platform/gp2x/build/mmuhack.o $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/gp2x/scummvm.gpe $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/gp2x/mmuhack/mmuhack.o $(bundle_name)/
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/
Commit: da688dbb7f20d08371a160d9fcc29776418d502d
https://github.com/scummvm/scummvm/commit/da688dbb7f20d08371a160d9fcc29776418d502d
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-13T00:01:15-07:00
Commit Message:
GPH: Move caanoo build support files into device folder in the backend.
Changed paths:
A backends/platform/gph/build/caanoo-build.sh
A backends/platform/gph/build/caanoo-bundle-debug.sh
A backends/platform/gph/build/caanoo-bundle.sh
A backends/platform/gph/build/caanoo-config-alleng.sh
A backends/platform/gph/build/caanoo-config.sh
A backends/platform/gph/devices/caanoo/scummvm-gdb.gpe
A backends/platform/gph/devices/caanoo/scummvm.gpe
R backends/platform/gph/caanoo/build.sh
R backends/platform/gph/caanoo/bundle-debug.sh
R backends/platform/gph/caanoo/bundle.sh
R backends/platform/gph/caanoo/config-alleng.sh
R backends/platform/gph/caanoo/config.sh
R backends/platform/gph/caanoo/clean.sh
R backends/platform/gph/caanoo/scummvm-gdb.gpe
R backends/platform/gph/caanoo/scummvm.gpe
backends/platform/gph/caanoo-bundle.mk
diff --git a/backends/platform/gph/build/caanoo-build.sh b/backends/platform/gph/build/caanoo-build.sh
new file mode 100644
index 0000000..8000d25
--- /dev/null
+++ b/backends/platform/gph/build/caanoo-build.sh
@@ -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.
diff --git a/backends/platform/gph/build/caanoo-bundle-debug.sh b/backends/platform/gph/build/caanoo-bundle-debug.sh
new file mode 100644
index 0000000..2d5cefe
--- /dev/null
+++ b/backends/platform/gph/build/caanoo-bundle-debug.sh
@@ -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
diff --git a/backends/platform/gph/build/caanoo-bundle.sh b/backends/platform/gph/build/caanoo-bundle.sh
new file mode 100644
index 0000000..76fd31c
--- /dev/null
+++ b/backends/platform/gph/build/caanoo-bundle.sh
@@ -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
diff --git a/backends/platform/gph/build/caanoo-config-alleng.sh b/backends/platform/gph/build/caanoo-config-alleng.sh
new file mode 100644
index 0000000..97fed94
--- /dev/null
+++ b/backends/platform/gph/build/caanoo-config-alleng.sh
@@ -0,0 +1,21 @@
+#!/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 and source it.
+. /opt/arm-caanoo/environment-setup
+
+# 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-png --with-png-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr \
+ --enable-all-engines --enable-vkeybd --enable-plugins --default-dynamic
+
+echo Generating config for Caanoo complete. Check for errors.
diff --git a/backends/platform/gph/build/caanoo-config.sh b/backends/platform/gph/build/caanoo-config.sh
new file mode 100644
index 0000000..11d5974
--- /dev/null
+++ b/backends/platform/gph/build/caanoo-config.sh
@@ -0,0 +1,21 @@
+#!/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
+
+# 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-png --with-png-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.
diff --git a/backends/platform/gph/caanoo-bundle.mk b/backends/platform/gph/caanoo-bundle.mk
index b7b3c9e..8aabca9 100755
--- a/backends/platform/gph/caanoo-bundle.mk
+++ b/backends/platform/gph/caanoo-bundle.mk
@@ -14,11 +14,11 @@ caanoo-bundle: $(EXECUTABLE)
echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
- $(CP) $(srcdir)/backends/platform/gph/caanoo/scummvm.gpe $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/README-GPH $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/caanoo/scummvm.gpe $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvmb.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.ini $(bundle_name)/
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
@@ -45,11 +45,11 @@ caanoo-bundle-debug: $(EXECUTABLE)
echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
- $(CP) $(srcdir)/backends/platform/gph/caanoo/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/README-GPH $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/caanoo/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvmb.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.ini $(bundle_name)/
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
diff --git a/backends/platform/gph/caanoo/build.sh b/backends/platform/gph/caanoo/build.sh
deleted file mode 100755
index 8000d25..0000000
--- a/backends/platform/gph/caanoo/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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.
diff --git a/backends/platform/gph/caanoo/bundle-debug.sh b/backends/platform/gph/caanoo/bundle-debug.sh
deleted file mode 100755
index 2d5cefe..0000000
--- a/backends/platform/gph/caanoo/bundle-debug.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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
diff --git a/backends/platform/gph/caanoo/bundle.sh b/backends/platform/gph/caanoo/bundle.sh
deleted file mode 100755
index 76fd31c..0000000
--- a/backends/platform/gph/caanoo/bundle.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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
diff --git a/backends/platform/gph/caanoo/clean.sh b/backends/platform/gph/caanoo/clean.sh
deleted file mode 100755
index 5ec1b9e..0000000
--- a/backends/platform/gph/caanoo/clean.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-echo Quick script to make building all the time less painful.
-
-cd ../../../..
-
-echo Cleaning ScummVM for the GP2X Wiz.
-make clean
diff --git a/backends/platform/gph/caanoo/config-alleng.sh b/backends/platform/gph/caanoo/config-alleng.sh
deleted file mode 100755
index 97fed94..0000000
--- a/backends/platform/gph/caanoo/config-alleng.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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 and source it.
-. /opt/arm-caanoo/environment-setup
-
-# 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-png --with-png-prefix=/opt/arm-caanoo/arm-none-linux-gnueabi/usr \
- --enable-all-engines --enable-vkeybd --enable-plugins --default-dynamic
-
-echo Generating config for Caanoo complete. Check for errors.
diff --git a/backends/platform/gph/caanoo/config.sh b/backends/platform/gph/caanoo/config.sh
deleted file mode 100755
index 11d5974..0000000
--- a/backends/platform/gph/caanoo/config.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
-
-# 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-png --with-png-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.
diff --git a/backends/platform/gph/caanoo/scummvm-gdb.gpe b/backends/platform/gph/caanoo/scummvm-gdb.gpe
deleted file mode 100755
index 63ce193..0000000
--- a/backends/platform/gph/caanoo/scummvm-gdb.gpe
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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.gph --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
diff --git a/backends/platform/gph/caanoo/scummvm.gpe b/backends/platform/gph/caanoo/scummvm.gpe
deleted file mode 100755
index 37d0f65..0000000
--- a/backends/platform/gph/caanoo/scummvm.gpe
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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.gph --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
diff --git a/backends/platform/gph/devices/caanoo/scummvm-gdb.gpe b/backends/platform/gph/devices/caanoo/scummvm-gdb.gpe
new file mode 100644
index 0000000..63ce193
--- /dev/null
+++ b/backends/platform/gph/devices/caanoo/scummvm-gdb.gpe
@@ -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.gph --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
diff --git a/backends/platform/gph/devices/caanoo/scummvm.gpe b/backends/platform/gph/devices/caanoo/scummvm.gpe
new file mode 100644
index 0000000..37d0f65
--- /dev/null
+++ b/backends/platform/gph/devices/caanoo/scummvm.gpe
@@ -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.gph --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
Commit: a18bb2e73d2580722fe418db7c307f9bc307e091
https://github.com/scummvm/scummvm/commit/a18bb2e73d2580722fe418db7c307f9bc307e091
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-13T00:01:16-07:00
Commit Message:
GPH: Move GP2XWIZ build support files into devices folder.
* Also add a common folder with the shared bits.
Changed paths:
A backends/platform/gph/build/gp2xwiz-build.sh
A backends/platform/gph/build/gp2xwiz-bundle-debug.sh
A backends/platform/gph/build/gp2xwiz-bundle.sh
A backends/platform/gph/build/gp2xwiz-config-alleng.sh
A backends/platform/gph/build/gp2xwiz-config.sh
A backends/platform/gph/devices/common/README-GPH
A backends/platform/gph/devices/common/scummvm.ini
A backends/platform/gph/devices/common/scummvm.png
A backends/platform/gph/devices/common/scummvmb.png
A backends/platform/gph/devices/gp2xwiz/scummvm-gdb.gpe
A backends/platform/gph/devices/gp2xwiz/scummvm.gpe
R backends/platform/gph/build/build.sh
R backends/platform/gph/build/bundle-debug.sh
R backends/platform/gph/build/bundle.sh
R backends/platform/gph/build/config-alleng.sh
R backends/platform/gph/build/config.sh
R backends/platform/gph/build/README-GPH
R backends/platform/gph/build/scummvm.ini
R backends/platform/gph/build/scummvm.png
R backends/platform/gph/build/scummvmb.png
R backends/platform/gph/build/scummvm-gdb.gpe
R backends/platform/gph/build/scummvm.gpe
backends/platform/gph/build/clean.sh
backends/platform/gph/gp2xwiz-bundle.mk
diff --git a/backends/platform/gph/build/README-GPH b/backends/platform/gph/build/README-GPH
deleted file mode 100644
index 64b9fcb..0000000
--- a/backends/platform/gph/build/README-GPH
+++ /dev/null
@@ -1,60 +0,0 @@
-ScummVM - GPH SPECIFIC README
-------------------------------------------------------------------------
-
-Contents:
-
- * About the backend/port <#About_the_backendport>
- * Supported audio options <#Supported_audio_options>
- * Credits <#Credits>
-
-------------------------------------------------------------------------
-
-Please refer to the:
-
-GPH ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14>
-
-WiKi: (Select your device)
-
-<http://wiki.scummvm.org/index.php/GP2X>
-<http://wiki.scummvm.org/index.php/GP2XWiz>
-<http://wiki.scummvm.org/index.php/Caanoo>
-
-for the most current information on the port and any updates to this
-documentation.
-
-The wiki includes detailed instructions on how to use the port and
-control information.
-
-------------------------------------------------------------------------
-About the backend/port
-
-This is the readme for the official GPH ScummVM backend (also known as
-the GP2X port/GP2XWiz port and Caanoo port).
-
-This is an SVN test release of ScummVM for GPH devices, 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.
-
-Fully supported official releases of the GPH ScummVM backend are made in
-line with main official releases and are avalalble from the ScummVM
-downloads page <http://www.scummvm.org/downloads.php> for the GP2X,
-GP2XWiz and Caanoo.
-
-------------------------------------------------------------------------
-Supported audio options
-
-Raw audio.
-MP3 audio.
-OGG Vorbis audio.
-
-FLAC audio is currently unsupported.
-
-For best results use uncompressed audio in games.
-
-------------------------------------------------------------------------
-Credits
-
-Core ScummVM code (c) The ScummVM Team
-Portions of the GPH backend (c) John Willis
-Detailed (c) information can be found within the source code
diff --git a/backends/platform/gph/build/build.sh b/backends/platform/gph/build/build.sh
deleted file mode 100755
index 876c3e3..0000000
--- a/backends/platform/gph/build/build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-echo Quick script to make building all the time less painful.
-
-# 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="-mcpu=arm926ej-s -mtune=arm926ej-s"
-export ASFLAGS=-mfloat-abi=soft
-
-cd ../../../..
-
-echo Building ScummVM for GP2X Wiz.
-make
-
-echo Build for GP2X Wiz - complete - Please check build logs.
diff --git a/backends/platform/gph/build/bundle-debug.sh b/backends/platform/gph/build/bundle-debug.sh
deleted file mode 100755
index cd5145b..0000000
--- a/backends/platform/gph/build/bundle-debug.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo Quick script to make building a distribution of the GP2X Wiz backend more consistent.
-
-cd ../../../..
-
-echo Building ScummVM for GP2X Wiz.
-
-make gp2xwiz-bundle-debug
diff --git a/backends/platform/gph/build/bundle.sh b/backends/platform/gph/build/bundle.sh
deleted file mode 100755
index 579e2dc..0000000
--- a/backends/platform/gph/build/bundle.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo Quick script to make building a distribution of the GP2X Wiz backend more consistent.
-
-cd ../../../..
-
-echo Building ScummVM for GP2X Wiz.
-
-make gp2xwiz-bundle
diff --git a/backends/platform/gph/build/clean.sh b/backends/platform/gph/build/clean.sh
index 5ec1b9e..6d58b7a 100755
--- a/backends/platform/gph/build/clean.sh
+++ b/backends/platform/gph/build/clean.sh
@@ -4,5 +4,5 @@ echo Quick script to make building all the time less painful.
cd ../../../..
-echo Cleaning ScummVM for the GP2X Wiz.
+echo Cleaning ScummVM for the GPH devices.
make clean
diff --git a/backends/platform/gph/build/config-alleng.sh b/backends/platform/gph/build/config-alleng.sh
deleted file mode 100755
index 9ec8a09..0000000
--- a/backends/platform/gph/build/config-alleng.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-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.
-
-# Set the paths up here to generate the config.
-
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
-
-# Export the tool names for cross-compiling
-export CXX=arm-open2x-linux-g++
-export CXXFLAGS="-mcpu=arm926ej-s -mtune=arm926ej-s"
-export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
-export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
-
-# Edit the configure line to suit.
-cd ../../../..
-./configure --backend=gph --disable-mt32emu --host=gp2xwiz --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 \
- --enable-png --with-png-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 \
- --enable-vkeybd --enable-all-engines --enable-plugins --default-dynamic
-
-echo Generating config for GP2X Wiz complete. Check for errors.
diff --git a/backends/platform/gph/build/config.sh b/backends/platform/gph/build/config.sh
deleted file mode 100755
index ac7c34a..0000000
--- a/backends/platform/gph/build/config.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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.
-
-# Set the paths up here to generate the config.
-
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
-PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
-
-# Export the tool names for cross-compiling
-export CXX=arm-open2x-linux-g++
-export CXXFLAGS="-mcpu=arm926ej-s -mtune=arm926ej-s"
-export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
-export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
-
-# Edit the configure line to suit.
-cd ../../../..
-./configure --backend=gph --disable-mt32emu --host=gp2xwiz --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 \
- --enable-png --with-png-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 \
- --enable-vkeybd --enable-plugins --default-dynamic
-
-echo Generating config for GP2X Wiz complete. Check for errors.
diff --git a/backends/platform/gph/build/gp2xwiz-build.sh b/backends/platform/gph/build/gp2xwiz-build.sh
new file mode 100644
index 0000000..876c3e3
--- /dev/null
+++ b/backends/platform/gph/build/gp2xwiz-build.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+echo Quick script to make building all the time less painful.
+
+# 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="-mcpu=arm926ej-s -mtune=arm926ej-s"
+export ASFLAGS=-mfloat-abi=soft
+
+cd ../../../..
+
+echo Building ScummVM for GP2X Wiz.
+make
+
+echo Build for GP2X Wiz - complete - Please check build logs.
diff --git a/backends/platform/gph/build/gp2xwiz-bundle-debug.sh b/backends/platform/gph/build/gp2xwiz-bundle-debug.sh
new file mode 100644
index 0000000..cd5145b
--- /dev/null
+++ b/backends/platform/gph/build/gp2xwiz-bundle-debug.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo Quick script to make building a distribution of the GP2X Wiz backend more consistent.
+
+cd ../../../..
+
+echo Building ScummVM for GP2X Wiz.
+
+make gp2xwiz-bundle-debug
diff --git a/backends/platform/gph/build/gp2xwiz-bundle.sh b/backends/platform/gph/build/gp2xwiz-bundle.sh
new file mode 100644
index 0000000..579e2dc
--- /dev/null
+++ b/backends/platform/gph/build/gp2xwiz-bundle.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo Quick script to make building a distribution of the GP2X Wiz backend more consistent.
+
+cd ../../../..
+
+echo Building ScummVM for GP2X Wiz.
+
+make gp2xwiz-bundle
diff --git a/backends/platform/gph/build/gp2xwiz-config-alleng.sh b/backends/platform/gph/build/gp2xwiz-config-alleng.sh
new file mode 100644
index 0000000..9ec8a09
--- /dev/null
+++ b/backends/platform/gph/build/gp2xwiz-config-alleng.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+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.
+
+# Set the paths up here to generate the config.
+
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
+
+# Export the tool names for cross-compiling
+export CXX=arm-open2x-linux-g++
+export CXXFLAGS="-mcpu=arm926ej-s -mtune=arm926ej-s"
+export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
+export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
+
+# Edit the configure line to suit.
+cd ../../../..
+./configure --backend=gph --disable-mt32emu --host=gp2xwiz --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 \
+ --enable-png --with-png-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 \
+ --enable-vkeybd --enable-all-engines --enable-plugins --default-dynamic
+
+echo Generating config for GP2X Wiz complete. Check for errors.
diff --git a/backends/platform/gph/build/gp2xwiz-config.sh b/backends/platform/gph/build/gp2xwiz-config.sh
new file mode 100644
index 0000000..ac7c34a
--- /dev/null
+++ b/backends/platform/gph/build/gp2xwiz-config.sh
@@ -0,0 +1,27 @@
+#!/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.
+
+# Set the paths up here to generate the config.
+
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
+
+# Export the tool names for cross-compiling
+export CXX=arm-open2x-linux-g++
+export CXXFLAGS="-mcpu=arm926ej-s -mtune=arm926ej-s"
+export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
+export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
+
+# Edit the configure line to suit.
+cd ../../../..
+./configure --backend=gph --disable-mt32emu --host=gp2xwiz --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 \
+ --enable-png --with-png-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 \
+ --enable-vkeybd --enable-plugins --default-dynamic
+
+echo Generating config for GP2X Wiz complete. Check for errors.
diff --git a/backends/platform/gph/build/scummvm-gdb.gpe b/backends/platform/gph/build/scummvm-gdb.gpe
deleted file mode 100755
index 63ce193..0000000
--- a/backends/platform/gph/build/scummvm-gdb.gpe
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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.gph --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
diff --git a/backends/platform/gph/build/scummvm.gpe b/backends/platform/gph/build/scummvm.gpe
deleted file mode 100755
index 59ff562..0000000
--- a/backends/platform/gph/build/scummvm.gpe
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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.gph --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
diff --git a/backends/platform/gph/build/scummvm.ini b/backends/platform/gph/build/scummvm.ini
deleted file mode 100644
index c9cce92..0000000
--- a/backends/platform/gph/build/scummvm.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[info]
-name="ScummVM"
-path="/scummvm/scummvm.gpe"
-icon="/scummvm/scummvm.png"
-title="/scummvm/scummvmb.png"
diff --git a/backends/platform/gph/build/scummvm.png b/backends/platform/gph/build/scummvm.png
deleted file mode 100644
index 128e59e..0000000
Binary files a/backends/platform/gph/build/scummvm.png and /dev/null differ
diff --git a/backends/platform/gph/build/scummvmb.png b/backends/platform/gph/build/scummvmb.png
deleted file mode 100644
index 24a27bc..0000000
Binary files a/backends/platform/gph/build/scummvmb.png and /dev/null differ
diff --git a/backends/platform/gph/devices/common/README-GPH b/backends/platform/gph/devices/common/README-GPH
new file mode 100644
index 0000000..ea196f6
--- /dev/null
+++ b/backends/platform/gph/devices/common/README-GPH
@@ -0,0 +1,60 @@
+ScummVM - GPH DEVICE SPECIFIC README
+------------------------------------------------------------------------
+
+Contents:
+
+ * About the backend/port <#About_the_backendport>
+ * Supported audio options <#Supported_audio_options>
+ * Credits <#Credits>
+
+------------------------------------------------------------------------
+
+Please refer to the:
+
+GPH ScummVM Forum: <http://forums.scummvm.org/viewforum.php?f=14>
+
+WiKi: (Select your device)
+
+<http://wiki.scummvm.org/index.php/GP2X>
+<http://wiki.scummvm.org/index.php/GP2XWiz>
+<http://wiki.scummvm.org/index.php/Caanoo>
+
+for the most current information on the port and any updates to this
+documentation.
+
+The wiki includes detailed instructions on how to use the port and
+control information.
+
+------------------------------------------------------------------------
+About the backend/port
+
+This is the readme for the official GPH ScummVM backend (also known as
+the GP2X port/GP2XWiz port or Caanoo port).
+
+This is an SVN test release of ScummVM for GPH devices, 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.
+
+Fully supported official releases of the GPH ScummVM backend are made in
+line with main official releases and are avalalble from the ScummVM
+downloads page <http://www.scummvm.org/downloads.php> for the GP2X,
+GP2XWiz and Caanoo.
+
+------------------------------------------------------------------------
+Supported audio options
+
+Raw audio.
+MP3 audio.
+OGG Vorbis audio.
+
+FLAC audio is currently unsupported.
+
+For best results use uncompressed audio in games.
+
+------------------------------------------------------------------------
+Credits
+
+Core ScummVM code (c) The ScummVM Team
+Portions of the GPH backend (c) John Willis
+Detailed (c) information can be found within the source code
diff --git a/backends/platform/gph/devices/common/scummvm.ini b/backends/platform/gph/devices/common/scummvm.ini
new file mode 100644
index 0000000..c9cce92
--- /dev/null
+++ b/backends/platform/gph/devices/common/scummvm.ini
@@ -0,0 +1,5 @@
+[info]
+name="ScummVM"
+path="/scummvm/scummvm.gpe"
+icon="/scummvm/scummvm.png"
+title="/scummvm/scummvmb.png"
diff --git a/backends/platform/gph/devices/common/scummvm.png b/backends/platform/gph/devices/common/scummvm.png
new file mode 100644
index 0000000..128e59e
Binary files /dev/null and b/backends/platform/gph/devices/common/scummvm.png differ
diff --git a/backends/platform/gph/devices/common/scummvmb.png b/backends/platform/gph/devices/common/scummvmb.png
new file mode 100644
index 0000000..24a27bc
Binary files /dev/null and b/backends/platform/gph/devices/common/scummvmb.png differ
diff --git a/backends/platform/gph/devices/gp2xwiz/scummvm-gdb.gpe b/backends/platform/gph/devices/gp2xwiz/scummvm-gdb.gpe
new file mode 100644
index 0000000..63ce193
--- /dev/null
+++ b/backends/platform/gph/devices/gp2xwiz/scummvm-gdb.gpe
@@ -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.gph --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
diff --git a/backends/platform/gph/devices/gp2xwiz/scummvm.gpe b/backends/platform/gph/devices/gp2xwiz/scummvm.gpe
new file mode 100644
index 0000000..59ff562
--- /dev/null
+++ b/backends/platform/gph/devices/gp2xwiz/scummvm.gpe
@@ -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.gph --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
diff --git a/backends/platform/gph/gp2xwiz-bundle.mk b/backends/platform/gph/gp2xwiz-bundle.mk
index 630857f..65e2952 100755
--- a/backends/platform/gph/gp2xwiz-bundle.mk
+++ b/backends/platform/gph/gp2xwiz-bundle.mk
@@ -13,11 +13,11 @@ gp2xwiz-bundle: $(EXECUTABLE)
echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm.gpe $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/README-GPH $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/gp2xwiz/scummvm.gpe $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvmb.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.ini $(bundle_name)/
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
@@ -47,11 +47,11 @@ gp2xwiz-bundle-debug: $(EXECUTABLE)
echo "Please put your save games in this dir" >> "$(bundle_name)/scummvm/saves/PUT_SAVES_IN_THIS_DIR"
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm.png $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvmb.png $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/README-GPH $(bundle_name)/scummvm/
- $(CP) $(srcdir)/backends/platform/gph/build/scummvm.ini $(bundle_name)/
+ $(CP) $(srcdir)/backends/platform/gph/devices/gp2xwiz/scummvm-gdb.gpe $(bundle_name)/scummvm/scummvm.gpe
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvmb.png $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/README-GPH $(bundle_name)/scummvm/
+ $(CP) $(srcdir)/backends/platform/gph/devices/common/scummvm.ini $(bundle_name)/
$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) $(bundle_name)/scummvm/
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(bundle_name)/scummvm/
Commit: 1986c1d82b83ea7a8a510e12ca7e78127de1da80
https://github.com/scummvm/scummvm/commit/1986c1d82b83ea7a8a510e12ca7e78127de1da80
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2011-04-13T00:01:16-07:00
Commit Message:
CONFIGURE: Add _timidity=no to the GPH devices to stop Timidity
support being built.
* This is for the GP2X, GP2XWIZ and Caanoo devices that use the
GPH backend.
Changed paths:
configure
diff --git a/configure b/configure
index a8810ca..acf39e4 100755
--- a/configure
+++ b/configure
@@ -1760,9 +1760,10 @@ if test -n "$_host"; then
add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
_backend="gph"
_build_hq_scalers=no
- _mt32emu=no
_vkeybd=yes
_seq_midi=no
+ _mt32emu=no
+ _timidity=no
_port_mk="backends/platform/gph/caanoo-bundle.mk"
;;
*darwin*)
@@ -1849,9 +1850,10 @@ if test -n "$_host"; then
add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
_backend="gph"
_build_hq_scalers=no
- _mt32emu=no
_vkeybd=yes
_seq_midi=no
+ _mt32emu=no
+ _timidity=no
_port_mk="backends/platform/gph/gp2x-bundle.mk"
;;
gp2xwiz)
@@ -1872,9 +1874,10 @@ if test -n "$_host"; then
add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
_backend="gph"
_build_hq_scalers=no
- _mt32emu=no
_vkeybd=yes
_seq_midi=no
+ _mt32emu=no
+ _timidity=no
_port_mk="backends/platform/gph/gp2xwiz-bundle.mk"
;;
iphone)
@@ -1992,8 +1995,8 @@ if test -n "$_host"; then
add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
_backend="openpandora"
_build_hq_scalers=yes
- _mt32emu=no
_vkeybd=no
+ _mt32emu=no
_seq_midi=no
_port_mk="backends/platform/openpandora/op-bundle.mk"
;;
More information about the Scummvm-git-logs
mailing list