diff options
Diffstat (limited to 'backends/platform/gp2xwiz')
29 files changed, 0 insertions, 1941 deletions
diff --git a/backends/platform/gp2xwiz/build/README-GP2XWIZ b/backends/platform/gp2xwiz/build/README-GP2XWIZ deleted file mode 100644 index ec8142a6f3..0000000000 --- a/backends/platform/gp2xwiz/build/README-GP2XWIZ +++ /dev/null @@ -1,140 +0,0 @@ -ScummVM - GP2X WIZ SPECIFIC README - HEAD SVN ------------------------------------------------------------------------- - -Contents: - -    * About the backend/port <#About_the_backendport> -    * Game compatability <#Game_compatibility> -    * Included engines <#Included_engines> -    * Supported audio options <#Supported_audio_options> -    * Supported cut-scene options <#Supported_cut-scene_options> -    * Recent changes <#Recent_changes> -    * How to save <#How_to_save> -    * Controller mappings <#Controller_mappings> -    * Known issues <#Knonw_issues> -    * Additional resources/links <#Additional_resourceslinks> -    * 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/GP2XWiz>  - -for the most current information on the port and any updates to this  -documentation. - ------------------------------------------------------------------------- -About the backend/port - -This is the readme for the official GP2XWiz ScummVM backend (also known as -the GP2XWiz port). - -This is an SVN test release of ScummVM for the GP2XWiz, 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 WIZ ScummVM backend are made in -line with main official releases and are avalalble from the ScummVM -downloads page <http://www.scummvm.org/downloads.php>. - -This build is in an active state of development and as such no -"expected" behavior can be guaranteed ;). - ------------------------------------------------------------------------- -Game compatibility - -For information on the compatability of a specific game please refer to -the GP2XWiz compatability section of the ScummVM WiKi -<http://wiki.scummvm.org/index.php/GP2XWiz#Compatibility_List>. - -Please note the version and date of the ScummVM build you are running -when reviewing the above list. - ------------------------------------------------------------------------- -Supported audio options - -Raw audio. -MP3 audio. -OGG Vorbis audio. - -FLAC audio is currently unsupported. - -For best results use uncompressed audio in games. - ------------------------------------------------------------------------- -How to save - -NOTE: Everything is saved to the SD card, saves are stored in the saves -folder under your main ScummVM executable unless you set another save -location. - -The configiration file for ScummVM (.scummvmrc) is stored in the same -place as the ScummVM executable. - -The save process below is for Scumm engine games but the principle is -the same for all. - -In Game. - -1. Menu Button -2. Select SAVE with B -3. Select a position with B -4. Right trigger puts 0 in the name box for some text. -5. Press B to save - -Basically the emulated keys you can use are equivelent to the values -buttons are mapped to, - ------------------------------------------------------------------------- -Controller mappings - -Touch screen: -Touch: Move Pointer and Left click - -Mouse emulation: - -dPad: Move Pointer -B: Left click -X: Right click - -Keyboard emulation: - -Right Trigger: Return -Select: Escape -Y: Space Bar (Pause) -Menu: Game Menu (Save, Load, Quit etc.) -Volume Buttons: Increase and Decrease volume - -Fancy button combos: - -NOTE: To use button combos press and hold the Left Trigger then... - -Right Trigger: Display Virtual Keyboard  -Menu: Bring up the Global main menu for ScummVM -Select: Exit ScummVM completely (and gracefully) - ------------------------------------------------------------------------- -Known issues - -No major known issues - ------------------------------------------------------------------------- -Additional resources/links - -    * ScummVM WiKi GP2X page <http://wiki.scummvm.org/index.php/GP2X> -    * ScummVM forums GP2X forum -      <http://forums.scummvm.org/viewforum.php?f=14> -    * My own ScummVM page <http://scummvm.distant-earth.com/> (for -      SVN/test builds) -    * Main ScummVM site <http://www.scummvm.org> (for official supported -      release builds) - ------------------------------------------------------------------------- -Credits - -Core ScummVM code (c) The ScummVM Team -GP2X Wiz backend (c) John Willis -Detailed (c) information can be found within the source code diff --git a/backends/platform/gp2xwiz/build/build.sh b/backends/platform/gp2xwiz/build/build.sh deleted file mode 100755 index 876c3e378a..0000000000 --- a/backends/platform/gp2xwiz/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/gp2xwiz/build/bundle-debug.sh b/backends/platform/gp2xwiz/build/bundle-debug.sh deleted file mode 100755 index cd5145b31d..0000000000 --- a/backends/platform/gp2xwiz/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/gp2xwiz/build/bundle.sh b/backends/platform/gp2xwiz/build/bundle.sh deleted file mode 100755 index 579e2dc77b..0000000000 --- a/backends/platform/gp2xwiz/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/gp2xwiz/build/clean.sh b/backends/platform/gp2xwiz/build/clean.sh deleted file mode 100755 index 5ec1b9e62c..0000000000 --- a/backends/platform/gp2xwiz/build/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/gp2xwiz/build/config-alleng.sh b/backends/platform/gp2xwiz/build/config-alleng.sh deleted file mode 100755 index cfed463edf..0000000000 --- a/backends/platform/gp2xwiz/build/config-alleng.sh +++ /dev/null @@ -1,22 +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 -export DEFINES=-DNDEBUG - -# Edit the configure line to suit. -cd ../../../.. -./configure --backend=gp2xwiz --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-all-engines --enable-vkeybd --enable-plugins --default-dynamic - -echo Generating config for GP2X Wiz complete. Check for errors. diff --git a/backends/platform/gp2xwiz/build/config.sh b/backends/platform/gp2xwiz/build/config.sh deleted file mode 100755 index 54c4795298..0000000000 --- a/backends/platform/gp2xwiz/build/config.sh +++ /dev/null @@ -1,22 +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 -export DEFINES=-DNDEBUG - -# Edit the configure line to suit. -cd ../../../.. -./configure --backend=gp2xwiz --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-vkeybd --enable-plugins --default-dynamic  - -echo Generating config for GP2X Wiz complete. Check for errors. diff --git a/backends/platform/gp2xwiz/build/scummvm-gdb.gpe b/backends/platform/gp2xwiz/build/scummvm-gdb.gpe deleted file mode 100755 index 64b6c8b974..0000000000 --- a/backends/platform/gp2xwiz/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.wiz --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/gp2xwiz/build/scummvm.gpe b/backends/platform/gp2xwiz/build/scummvm.gpe deleted file mode 100755 index 42cc00a22a..0000000000 --- a/backends/platform/gp2xwiz/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.wiz --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/gp2xwiz/build/scummvm.ini b/backends/platform/gp2xwiz/build/scummvm.ini deleted file mode 100644 index c9cce92379..0000000000 --- a/backends/platform/gp2xwiz/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/gp2xwiz/build/scummvm.png b/backends/platform/gp2xwiz/build/scummvm.png Binary files differdeleted file mode 100644 index 128e59efc4..0000000000 --- a/backends/platform/gp2xwiz/build/scummvm.png +++ /dev/null diff --git a/backends/platform/gp2xwiz/build/scummvmb.png b/backends/platform/gp2xwiz/build/scummvmb.png Binary files differdeleted file mode 100644 index 24a27bc0e1..0000000000 --- a/backends/platform/gp2xwiz/build/scummvmb.png +++ /dev/null diff --git a/backends/platform/gp2xwiz/caanoo/build.sh b/backends/platform/gp2xwiz/caanoo/build.sh deleted file mode 100755 index 8000d2595d..0000000000 --- a/backends/platform/gp2xwiz/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/gp2xwiz/caanoo/bundle-debug.sh b/backends/platform/gp2xwiz/caanoo/bundle-debug.sh deleted file mode 100755 index 2d5cefe80e..0000000000 --- a/backends/platform/gp2xwiz/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/gp2xwiz/caanoo/bundle.sh b/backends/platform/gp2xwiz/caanoo/bundle.sh deleted file mode 100755 index 76fd31cec6..0000000000 --- a/backends/platform/gp2xwiz/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/gp2xwiz/caanoo/caanoo-bundle.mk b/backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk deleted file mode 100755 index d02ed5fe16..0000000000 --- a/backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk +++ /dev/null @@ -1,69 +0,0 @@ -# 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/scummvmb.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/scummvmb.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 diff --git a/backends/platform/gp2xwiz/caanoo/clean.sh b/backends/platform/gp2xwiz/caanoo/clean.sh deleted file mode 100755 index 5ec1b9e62c..0000000000 --- a/backends/platform/gp2xwiz/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/gp2xwiz/caanoo/config-alleng.sh b/backends/platform/gp2xwiz/caanoo/config-alleng.sh deleted file mode 100755 index 7a097c268b..0000000000 --- a/backends/platform/gp2xwiz/caanoo/config-alleng.sh +++ /dev/null @@ -1,16 +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 - -# 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. diff --git a/backends/platform/gp2xwiz/caanoo/config.sh b/backends/platform/gp2xwiz/caanoo/config.sh deleted file mode 100755 index 73ce5da624..0000000000 --- a/backends/platform/gp2xwiz/caanoo/config.sh +++ /dev/null @@ -1,16 +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 - -# 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. diff --git a/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe b/backends/platform/gp2xwiz/caanoo/scummvm-gdb.gpe deleted file mode 100755 index a8f2aae0fe..0000000000 --- a/backends/platform/gp2xwiz/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.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 diff --git a/backends/platform/gp2xwiz/caanoo/scummvm.gpe b/backends/platform/gp2xwiz/caanoo/scummvm.gpe deleted file mode 100755 index 8341ffc3d7..0000000000 --- a/backends/platform/gp2xwiz/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.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 diff --git a/backends/platform/gp2xwiz/gp2xwiz-bundle.mk b/backends/platform/gp2xwiz/gp2xwiz-bundle.mk deleted file mode 100755 index c572b86939..0000000000 --- a/backends/platform/gp2xwiz/gp2xwiz-bundle.mk +++ /dev/null @@ -1,75 +0,0 @@ -# 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)) - -gp2xwiz-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/build/scummvm.gpe $(bundle_name)/scummvm/ -	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvm.png $(bundle_name)/scummvm/ -	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/scummvmb.png $(bundle_name)/scummvm/ -	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/ -	$(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 -	 -	$(CP) $(libloc)/../lib/libz.so.1.2.3 $(bundle_name)/scummvm/lib/libz.so.1 -	$(CP) $(libloc)/../lib/libvorbisidec.so.1.0.2 $(bundle_name)/scummvm/lib/libvorbisidec.so.1 - -	tar -C $(bundle_name) -cvjf $(bundle_name).tar.bz2 . -	rm -R ./$(bundle_name)	 - -gp2xwiz-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/build/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/scummvmb.png $(bundle_name)/scummvm/ -	$(CP) $(srcdir)/backends/platform/gp2xwiz/build/README-GP2XWIZ $(bundle_name)/scummvm/ -	$(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 -	 -	$(CP) $(libloc)/../lib/libz.so.1.2.3 $(bundle_name)/scummvm/lib/libz.so.1 -	$(CP) $(libloc)/../lib/libvorbisidec.so.1.0.2 $(bundle_name)/scummvm/lib/libvorbisidec.so.1 - -	tar -C $(bundle_name) -cvjf $(bundle_name)-debug.tar.bz2 . -	rm -R ./$(bundle_name)	 - -.PHONY: gp2xwiz-bundle gp2xwiz-bundle-debug diff --git a/backends/platform/gp2xwiz/gp2xwiz-events.cpp b/backends/platform/gp2xwiz/gp2xwiz-events.cpp deleted file mode 100644 index b226dbddb0..0000000000 --- a/backends/platform/gp2xwiz/gp2xwiz-events.cpp +++ /dev/null @@ -1,482 +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$ - * - */ - -/* - * GPH: Device Specific Event Handling. - * - */ - -#include "backends/platform/gp2xwiz/gp2xwiz-sdl.h" -#include "backends/platform/gp2xwiz/gp2xwiz-hw.h" -#include "graphics/scaler/aspect.h" - -#include "common/util.h" -#include "common/events.h" - -#define JOY_DEADZONE 2200 - -#define JOY_XAXIS 0 -#define JOY_YAXIS 1 - -/* Quick default button states for modifiers. */ -int BUTTON_STATE_L					=	false; - -#if defined(CAANOO) - -	/* Caanoo: Main Joystick Button Mappings */ -	/* 		   The Caanoo has an analogue stick so no digital DPAD */ -	enum { -		/* Joystick Buttons */ -		BUTTON_A			= 0, -		BUTTON_X			= 1, -		BUTTON_B			= 2, -		BUTTON_Y			= 3, -		BUTTON_L			= 4, -		BUTTON_R			= 5, -		BUTTON_HOME			= 6,	// Home -		BUTTON_HOLD			= 7,	// Hold (on Power) -		BUTTON_HELP			= 8,	// Help I -		BUTTON_HELP2		= 9,	// Help II -		BUTTON_CLICK		= 10	// Stick Click -	}; - -	enum { -		/* Unused Joystick Buttons on the Caanoo */ -		BUTTON_VOLUP		= 51, -		BUTTON_VOLDOWN		= 52, -		BUTTON_UP			= 53, -		BUTTON_UPLEFT		= 54, -		BUTTON_LEFT			= 55, -		BUTTON_DOWNLEFT		= 56, -		BUTTON_DOWN			= 57, -		BUTTON_DOWNRIGHT	= 58, -		BUTTON_RIGHT		= 59, -		BUTTON_UPRIGHT		= 60, -		BUTTON_MENU			= 61, -		BUTTON_SELECT		= 62 -	}; - -#else - -	/* Wiz: Main Joystick Mappings */ -	enum { -		/* DPAD */ -		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, -		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 -	}; - -	enum { -		/* Unused Joystick Buttons on the Wiz */ -		BUTTON_HOME			= 51, -		BUTTON_HOLD			= 52, -		BUTTON_CLICK		= 53, -		BUTTON_HELP			= 54, -		BUTTON_HELP2		= 55 -	}; - -#endif - -enum { -	/* Touchscreen TapMode */ -	TAPMODE_LEFT		= 0, -	TAPMODE_RIGHT		= 1, -	TAPMODE_HOVER		= 2 -}; - -static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode) { -	if (key >= SDLK_F1 && key <= SDLK_F9) { -		return key - SDLK_F1 + Common::ASCII_F1; -	} else if (key >= SDLK_KP0 && key <= SDLK_KP9) { -		return key - SDLK_KP0 + '0'; -	} else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) { -		return key; -	} else if (unicode) { -		return unicode; -	} else if (key >= 'a' && key <= 'z' && (mod & KMOD_SHIFT)) { -		return key & ~0x20; -	} else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) { -		return 0; -	} -	return key; -} - - -void OSystem_GPH::fillMouseEvent(Common::Event &event, int x, int y) { -	if (_videoMode.mode == GFX_HALF && !_overlayVisible){ -		event.mouse.x = x*2; -		event.mouse.y = y*2; -	} else { -		event.mouse.x = x; -		event.mouse.y = y; -	} - -	// Update the "keyboard mouse" coords -	_km.x = x; -	_km.y = y; - -	// Adjust for the screen scaling -	if (!_overlayVisible) { -		event.mouse.x /= _videoMode.scaleFactor; -		event.mouse.y /= _videoMode.scaleFactor; -		if (_videoMode.aspectRatioCorrection) -			event.mouse.y = aspect2Real(event.mouse.y); -	} -} - - -void OSystem_GPH::moveStick() { -	bool stickBtn[32]; - -	memcpy(stickBtn, _stickBtn, sizeof(stickBtn)); - -	if ((stickBtn[0])||(stickBtn[2])||(stickBtn[4])||(stickBtn[6])) -		stickBtn[1] = stickBtn[3] = stickBtn[5] = stickBtn[7] = 0; - -	if ((stickBtn[1])||(stickBtn[2])||(stickBtn[3])) { -		if (_km.x_down_count!=2) { -			_km.x_vel = -1; -			_km.x_down_count = 1; -		} else -			_km.x_vel = -4; -	} else if ((stickBtn[5])||(stickBtn[6])||(stickBtn[7])) { -		if (_km.x_down_count!=2) { -			_km.x_vel = 1; -			_km.x_down_count = 1; -		} else -			_km.x_vel = 4; -	} else { -		_km.x_vel = 0; -		_km.x_down_count = 0; -	} - -	if ((stickBtn[0])||(stickBtn[1])||(stickBtn[7])) { -		if (_km.y_down_count!=2) { -			_km.y_vel = -1; -			_km.y_down_count = 1; -		} else -			_km.y_vel = -4; -	} else if ((stickBtn[3])||(stickBtn[4])||(stickBtn[5])) { -		if (_km.y_down_count!=2) { -			_km.y_vel = 1; -			_km.y_down_count = 1; -		} else -			_km.y_vel = 4; -	} else { -		_km.y_vel = 0; -		_km.y_down_count = 0; -	} -} - -/* Custom handleMouseButtonDown/handleMouseButtonUp to deal with 'Tap Mode' for the touchscreen */ - -bool OSystem_GPH::handleMouseButtonDown(SDL_Event &ev, Common::Event &event) { -	if (ev.button.button == SDL_BUTTON_LEFT){ -		if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */ -			event.type = Common::EVENT_RBUTTONDOWN; -		else if (GPH::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */ -			event.type = Common::EVENT_LBUTTONDOWN; -		else if (GPH::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */ -			event.type = Common::EVENT_RBUTTONDOWN; -		else if (GPH::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */ -			event.type = Common::EVENT_MOUSEMOVE; -		else -			event.type = Common::EVENT_LBUTTONDOWN; /* For normal mice etc. */ -	} -	else if (ev.button.button == SDL_BUTTON_RIGHT) -		event.type = Common::EVENT_RBUTTONDOWN; -#if defined(SDL_BUTTON_WHEELUP) && defined(SDL_BUTTON_WHEELDOWN) -	else if (ev.button.button == SDL_BUTTON_WHEELUP) -		event.type = Common::EVENT_WHEELUP; -	else if (ev.button.button == SDL_BUTTON_WHEELDOWN) -		event.type = Common::EVENT_WHEELDOWN; -#endif -#if defined(SDL_BUTTON_MIDDLE) -	else if (ev.button.button == SDL_BUTTON_MIDDLE) -		event.type = Common::EVENT_MBUTTONDOWN; -#endif -	else -		return false; - -	fillMouseEvent(event, ev.button.x, ev.button.y); - -	return true; -} - -bool OSystem_GPH::handleMouseButtonUp(SDL_Event &ev, Common::Event &event) { -	if (ev.button.button == SDL_BUTTON_LEFT){ -		if (BUTTON_STATE_L == true) /* BUTTON_STATE_L = Left Trigger Held, force Right Click */ -			event.type = Common::EVENT_RBUTTONUP; -		else if (GPH::tapmodeLevel == TAPMODE_LEFT) /* TAPMODE_LEFT = Left Click Tap Mode */ -			event.type = Common::EVENT_LBUTTONUP; -		else if (GPH::tapmodeLevel == TAPMODE_RIGHT) /* TAPMODE_RIGHT = Right Click Tap Mode */ -			event.type = Common::EVENT_RBUTTONUP; -		else if (GPH::tapmodeLevel == TAPMODE_HOVER) /* TAPMODE_HOVER = Hover (No Click) Tap Mode */ -			event.type = Common::EVENT_MOUSEMOVE; -		else -			event.type = Common::EVENT_LBUTTONUP; /* For normal mice etc. */ - -	} -	else if (ev.button.button == SDL_BUTTON_RIGHT) -		event.type = Common::EVENT_RBUTTONUP; -#if defined(SDL_BUTTON_MIDDLE) -	else if (ev.button.button == SDL_BUTTON_MIDDLE) -		event.type = Common::EVENT_MBUTTONUP; -#endif -	else -		return false; - -	fillMouseEvent(event, ev.button.x, ev.button.y); - -	return true; -} - -/* Custom handleJoyButtonDown/handleJoyButtonUp to deal with the joystick buttons on GPH devices */ - -bool OSystem_GPH::handleJoyButtonDown(SDL_Event &ev, Common::Event &event) { - -	_stickBtn[ev.jbutton.button] = 1; -	event.kbd.flags = 0; - -	switch (ev.jbutton.button) { -	case BUTTON_UP: -	case BUTTON_UPLEFT: -	case BUTTON_LEFT: -	case BUTTON_DOWNLEFT: -	case BUTTON_DOWN: -	case BUTTON_DOWNRIGHT: -	case BUTTON_RIGHT: -	case BUTTON_UPRIGHT: -		moveStick(); -		event.type = Common::EVENT_MOUSEMOVE; -		fillMouseEvent(event, _km.x, _km.y); -		break; -	case BUTTON_B: -	case BUTTON_CLICK: -		event.type = Common::EVENT_LBUTTONDOWN; -		fillMouseEvent(event, _km.x, _km.y); -		break; -	case BUTTON_X: -		event.type = Common::EVENT_RBUTTONDOWN; -		fillMouseEvent(event, _km.x, _km.y); -		break; -	case BUTTON_L: -		BUTTON_STATE_L = true; -		break; -	case BUTTON_R: -		event.type = Common::EVENT_KEYDOWN; -		if (BUTTON_STATE_L == true) { -#ifdef ENABLE_VKEYBD -			event.kbd.keycode = Common::KEYCODE_F7; -			event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0); -#else -			event.kbd.keycode = Common::KEYCODE_0; -			event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0); -#endif -		} else { -			event.kbd.keycode = Common::KEYCODE_RETURN; -			event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0); -		} -		break; -	case BUTTON_SELECT: -	case BUTTON_HOME: -		event.type = Common::EVENT_KEYDOWN; -		if (BUTTON_STATE_L == true) { -			event.type = Common::EVENT_QUIT; -		} else { -			event.kbd.keycode = Common::KEYCODE_ESCAPE; -			event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0); -		} -		break; -	case BUTTON_A: -		event.type = Common::EVENT_KEYDOWN; -		if (BUTTON_STATE_L == true) { -			event.type = Common::EVENT_PREDICTIVE_DIALOG; -		} else { -		event.kbd.keycode = Common::KEYCODE_PERIOD; -		event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0); -		} -		break; -	case BUTTON_Y: -		event.type = Common::EVENT_KEYDOWN; -		if (BUTTON_STATE_L == true) { -			GPH::ToggleTapMode(); -			if (GPH::tapmodeLevel == TAPMODE_LEFT) { -				displayMessageOnOSD("Touchscreen 'Tap Mode' - Left Click"); -			} else if (GPH::tapmodeLevel == TAPMODE_RIGHT) { -				displayMessageOnOSD("Touchscreen 'Tap Mode' - Right Click"); -			} else if (GPH::tapmodeLevel == TAPMODE_HOVER) { -				displayMessageOnOSD("Touchscreen 'Tap Mode' - Hover (No Click)"); -			} -		} else { -			event.kbd.keycode = Common::KEYCODE_SPACE; -			event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0); -		} -		break; -	case BUTTON_MENU: -	case BUTTON_HELP: -		event.type = Common::EVENT_KEYDOWN; -		if (BUTTON_STATE_L == true) { -			event.type = Common::EVENT_MAINMENU; -		} else { -			event.kbd.keycode = Common::KEYCODE_F5; -			event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0); -		} -		break; -	case BUTTON_VOLUP: -		WIZ_HW::mixerMoveVolume(2); -		if (WIZ_HW::volumeLevel == 100) { -			displayMessageOnOSD("Maximum Volume"); -		} else { -			displayMessageOnOSD("Increasing Volume"); -		} -		break; -	case BUTTON_VOLDOWN: -		WIZ_HW::mixerMoveVolume(1); -		if (WIZ_HW::volumeLevel == 0) { -			displayMessageOnOSD("Minimal Volume"); -		} else { -			displayMessageOnOSD("Decreasing Volume"); -		} -		break; -	case BUTTON_HOLD: -		event.type = Common::EVENT_QUIT; -		break; -	case BUTTON_HELP2: -		GPH::ToggleTapMode(); -		if (GPH::tapmodeLevel == TAPMODE_LEFT) { -			displayMessageOnOSD("Touchscreen 'Tap Mode': Left Click"); -		} else if (GPH::tapmodeLevel == TAPMODE_RIGHT) { -			displayMessageOnOSD("Touchscreen 'Tap Mode': Right Click"); -		} else if (GPH::tapmodeLevel == TAPMODE_HOVER) { -			displayMessageOnOSD("Touchscreen 'Tap Mode': Hover (No Click)"); -		} -		break; -	} -	return true; -} - -bool OSystem_GPH::handleJoyButtonUp(SDL_Event &ev, Common::Event &event) { - -	_stickBtn[ev.jbutton.button] = 0; -	event.kbd.flags = 0; - -	switch (ev.jbutton.button) { -	case BUTTON_UP: -	case BUTTON_UPLEFT: -	case BUTTON_LEFT: -	case BUTTON_DOWNLEFT: -	case BUTTON_DOWN: -	case BUTTON_DOWNRIGHT: -	case BUTTON_RIGHT: -	case BUTTON_UPRIGHT: -		moveStick(); -		event.type = Common::EVENT_MOUSEMOVE; -		fillMouseEvent(event, _km.x, _km.y); -		break; -	case BUTTON_B: -	case BUTTON_CLICK: -		event.type = Common::EVENT_LBUTTONUP; -		fillMouseEvent(event, _km.x, _km.y); -		break; -	case BUTTON_X: -		event.type = Common::EVENT_RBUTTONUP; -		fillMouseEvent(event, _km.x, _km.y); -		break; -	case BUTTON_L: -		BUTTON_STATE_L = false; -		break; -	case BUTTON_SELECT: -	case BUTTON_HOME: -		event.type = Common::EVENT_KEYUP; -		event.kbd.keycode = Common::KEYCODE_ESCAPE; -		event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0); -		break; -	case BUTTON_A: -		event.type = Common::EVENT_KEYUP; -		event.kbd.keycode = Common::KEYCODE_PERIOD; -		event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0); -		break; -	case BUTTON_Y: -		event.type = Common::EVENT_KEYUP; -		event.kbd.keycode = Common::KEYCODE_SPACE; -		event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0); -		break; -	case BUTTON_MENU: -	case BUTTON_HELP: -		event.type = Common::EVENT_KEYUP; -		if (BUTTON_STATE_L == true) { -			event.type = Common::EVENT_MAINMENU; -		} else { -			event.kbd.keycode = Common::KEYCODE_F5; -			event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0); -		} -		break; -	case BUTTON_R: -		event.type = Common::EVENT_KEYUP; -		if (BUTTON_STATE_L == true) { -#ifdef ENABLE_VKEYBD -			event.kbd.keycode = Common::KEYCODE_F7; -			event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0); -#else -			event.kbd.keycode = Common::KEYCODE_0; -			event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0); -#endif -		} else { -			event.kbd.keycode = Common::KEYCODE_RETURN; -			event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0); -		} -		break; -	case BUTTON_VOLUP: -		break; -	case BUTTON_VOLDOWN: -		break; -	case BUTTON_HOLD: -		break; -	case BUTTON_HELP2: -		break; -	} -	return true; -} - -bool OSystem_GPH::remapKey(SDL_Event &ev,Common::Event &event) { -	return false; -} diff --git a/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp b/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp deleted file mode 100644 index 92329d7c40..0000000000 --- a/backends/platform/gp2xwiz/gp2xwiz-graphics.cpp +++ /dev/null @@ -1,470 +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 "backends/platform/gp2xwiz/gp2xwiz-sdl.h" - -#include "common/mutex.h" -#include "graphics/font.h" -#include "graphics/fontman.h" -#include "graphics/scaler.h" -#include "graphics/scaler/aspect.h" -#include "graphics/scaler/downscaler.h" -#include "graphics/surface.h" - -static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { -	{"1x", "Fullscreen", GFX_NORMAL}, -	{0, 0, 0} -}; - -const OSystem::GraphicsMode *OSystem_GPH::getSupportedGraphicsModes() const { -	return s_supportedGraphicsModes; -} - -int OSystem_GPH::getDefaultGraphicsMode() const { -	return GFX_NORMAL; -} - -bool OSystem_GPH::setGraphicsMode(int mode) { -	Common::StackLock lock(_graphicsMutex); - -	assert(_transactionMode == kTransactionActive); - -	if (_oldVideoMode.setup && _oldVideoMode.mode == mode) -		return true; - -	int newScaleFactor = 1; - -	switch (mode) { -	case GFX_NORMAL: -		newScaleFactor = 1; -		break; -	case GFX_HALF: -		newScaleFactor = 1; -		break; -	default: -		warning("unknown gfx mode %d", mode); -		return false; -	} - -	_transactionDetails.normal1xScaler = (mode == GFX_NORMAL); -	if (_oldVideoMode.setup && _oldVideoMode.scaleFactor != newScaleFactor) -		_transactionDetails.needHotswap = true; - -	_transactionDetails.needUpdatescreen = true; - -	_videoMode.mode = mode; -	_videoMode.scaleFactor = newScaleFactor; - -	return true; -} - -void OSystem_GPH::setGraphicsModeIntern() { -	Common::StackLock lock(_graphicsMutex); -	ScalerProc *newScalerProc = 0; - -	switch (_videoMode.mode) { -	case GFX_NORMAL: -		newScalerProc = Normal1x; -		break; -	case GFX_HALF: -		newScalerProc = DownscaleAllByHalf; -		break; - -	default: -		error("Unknown gfx mode %d", _videoMode.mode); -	} - -	_scalerProc = newScalerProc; - -	if (!_screen || !_hwscreen) -		return; - -	// Blit everything to the screen -	_forceFull = true; - -	// Even if the old and new scale factors are the same, we may have a -	// different scaler for the cursor now. -	blitCursor(); -} - -void OSystem_GPH::initSize(uint w, uint h) { -	assert(_transactionMode == kTransactionActive); - -	// Avoid redundant res changes -	if ((int)w == _videoMode.screenWidth && (int)h == _videoMode.screenHeight) -		return; - -	_videoMode.screenWidth = w; -	_videoMode.screenHeight = h; -	if (w > 320 || h > 240){ -		setGraphicsMode(GFX_HALF); -		setGraphicsModeIntern(); -		toggleMouseGrab(); -	} - -	_transactionDetails.sizeChanged = true; -} - -bool OSystem_GPH::loadGFXMode() { -	if (_videoMode.screenWidth > 320 || _videoMode.screenHeight > 240) { -		_videoMode.aspectRatioCorrection = false; -		setGraphicsMode(GFX_HALF); -		printf("GFX_HALF\n"); -	} else { -		setGraphicsMode(GFX_NORMAL); -		printf("GFX_NORMAL\n"); -	} - -	if ((_videoMode.mode == GFX_HALF) && !_overlayVisible) { -		_videoMode.overlayWidth = _videoMode.screenWidth / 2; -		_videoMode.overlayHeight = _videoMode.screenHeight / 2; -		_videoMode.fullscreen = true; -	} else { - -		_videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor; -		_videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor; - -		if (_videoMode.aspectRatioCorrection) -			_videoMode.overlayHeight = real2Aspect(_videoMode.overlayHeight); - -		_videoMode.hardwareWidth = _videoMode.screenWidth * _videoMode.scaleFactor; -		_videoMode.hardwareHeight = effectiveScreenHeight(); -	} -	return OSystem_SDL::loadGFXMode(); -} - -void OSystem_GPH::drawMouse() { -	if (!_mouseVisible || !_mouseSurface) { -		_mouseBackup.x = _mouseBackup.y = _mouseBackup.w = _mouseBackup.h = 0; -		return; -	} - -	SDL_Rect dst; -	int scale; -	int width, height; -	int hotX, hotY; - -	if (_videoMode.mode == GFX_HALF && !_overlayVisible){ -		dst.x = _mouseCurState.x/2; -		dst.y = _mouseCurState.y/2; -	} else { -		dst.x = _mouseCurState.x; -		dst.y = _mouseCurState.y; -	} - -	if (!_overlayVisible) { -		scale = _videoMode.scaleFactor; -		width = _videoMode.screenWidth; -		height = _videoMode.screenHeight; -		dst.w = _mouseCurState.vW; -		dst.h = _mouseCurState.vH; -		hotX = _mouseCurState.vHotX; -		hotY = _mouseCurState.vHotY; -	} else { -		scale = 1; -		width = _videoMode.overlayWidth; -		height = _videoMode.overlayHeight; -		dst.w = _mouseCurState.rW; -		dst.h = _mouseCurState.rH; -		hotX = _mouseCurState.rHotX; -		hotY = _mouseCurState.rHotY; -	} - -	// The mouse is undrawn using virtual coordinates, i.e. they may be -	// scaled and aspect-ratio corrected. - -	_mouseBackup.x = dst.x - hotX; -	_mouseBackup.y = dst.y - hotY; -	_mouseBackup.w = dst.w; -	_mouseBackup.h = dst.h; - -	// We draw the pre-scaled cursor image, so now we need to adjust for -	// scaling, shake position and aspect ratio correction manually. - -	if (!_overlayVisible) { -		dst.y += _currentShakePos; -	} - -	if (_videoMode.aspectRatioCorrection && !_overlayVisible) -		dst.y = real2Aspect(dst.y); - -	dst.x = scale * dst.x - _mouseCurState.rHotX; -	dst.y = scale * dst.y - _mouseCurState.rHotY; -	dst.w = _mouseCurState.rW; -	dst.h = _mouseCurState.rH; - -	// Note that SDL_BlitSurface() and addDirtyRect() will both perform any -	// clipping necessary - -	if (SDL_BlitSurface(_mouseSurface, NULL, _hwscreen, &dst) != 0) -		error("SDL_BlitSurface failed: %s", SDL_GetError()); - -	// The screen will be updated using real surface coordinates, i.e. -	// they will not be scaled or aspect-ratio corrected. -	addDirtyRect(dst.x, dst.y, dst.w, dst.h, true); -} - -void OSystem_GPH::undrawMouse() { -	const int x = _mouseBackup.x; -	const int y = _mouseBackup.y; - -	// When we switch bigger overlay off mouse jumps. Argh! -	// This is intended to prevent undrawing offscreen mouse -	if (!_overlayVisible && (x >= _videoMode.screenWidth || y >= _videoMode.screenHeight)) -		return; - -	if (_mouseBackup.w != 0 && _mouseBackup.h != 0){ -		if (_videoMode.mode == GFX_HALF && !_overlayVisible){ -			addDirtyRect(x*2, y*2, _mouseBackup.w*2, _mouseBackup.h*2); -		} else { -			addDirtyRect(x, y, _mouseBackup.w, _mouseBackup.h); -		} -	} -} - -void OSystem_GPH::internUpdateScreen() { -	SDL_Surface *srcSurf, *origSurf; -	int height, width; -	ScalerProc *scalerProc; -	int scale1; - -#if defined (DEBUG) -	assert(_hwscreen != NULL); -	assert(_hwscreen->map->sw_data != NULL); -#endif - -	// If the shake position changed, fill the dirty area with blackness -	if (_currentShakePos != _newShakePos || -		(_mouseNeedsRedraw && _mouseBackup.y <= _currentShakePos)) { -		SDL_Rect blackrect = {0, 0, _videoMode.screenWidth * _videoMode.scaleFactor, _newShakePos * _videoMode.scaleFactor}; - -		if (_videoMode.aspectRatioCorrection && !_overlayVisible) -			blackrect.h = real2Aspect(blackrect.h - 1) + 1; - -		SDL_FillRect(_hwscreen, &blackrect, 0); - -		_currentShakePos = _newShakePos; - -		_forceFull = true; -	} - -	// Check whether the palette was changed in the meantime and update the -	// screen surface accordingly. -	if (_screen && _paletteDirtyEnd != 0) { -		SDL_SetColors(_screen, _currentPalette + _paletteDirtyStart, -			_paletteDirtyStart, -			_paletteDirtyEnd - _paletteDirtyStart); - -		_paletteDirtyEnd = 0; - -		_forceFull = true; -	} - -#ifdef USE_OSD -	// OSD visible (i.e. non-transparent)? -	if (_osdAlpha != SDL_ALPHA_TRANSPARENT) { -		// Updated alpha value -		const int diff = SDL_GetTicks() - _osdFadeStartTime; -		if (diff > 0) { -			if (diff >= kOSDFadeOutDuration) { -				// Back to full transparency -				_osdAlpha = SDL_ALPHA_TRANSPARENT; -			} else { -				// Do a linear fade out... -				const int startAlpha = SDL_ALPHA_TRANSPARENT + kOSDInitialAlpha * (SDL_ALPHA_OPAQUE - SDL_ALPHA_TRANSPARENT) / 100; -				_osdAlpha = startAlpha + diff * (SDL_ALPHA_TRANSPARENT - startAlpha) / kOSDFadeOutDuration; -			} -			SDL_SetAlpha(_osdSurface, SDL_RLEACCEL | SDL_SRCCOLORKEY | SDL_SRCALPHA, _osdAlpha); -			_forceFull = true; -		} -	} -#endif - -	if (!_overlayVisible) { -		origSurf = _screen; -		srcSurf = _tmpscreen; -		width = _videoMode.screenWidth; -		height = _videoMode.screenHeight; -		scalerProc = _scalerProc; -		scale1 = _videoMode.scaleFactor; -	} else { -		origSurf = _overlayscreen; -		srcSurf = _tmpscreen2; -		width = _videoMode.overlayWidth; -		height = _videoMode.overlayHeight; -		scalerProc = Normal1x; - -		scale1 = 1; -	} - -	// Add the area covered by the mouse cursor to the list of dirty rects if -	// we have to redraw the mouse. -	if (_mouseNeedsRedraw) -		undrawMouse(); - -	// Force a full redraw if requested -	if (_forceFull) { -		_numDirtyRects = 1; -		_dirtyRectList[0].x = 0; -		_dirtyRectList[0].y = 0; -		_dirtyRectList[0].w = width; -		_dirtyRectList[0].h = height; -	} - -	// Only draw anything if necessary -	if (_numDirtyRects > 0 || _mouseNeedsRedraw) { -		SDL_Rect *r; -		SDL_Rect dst; -		uint32 srcPitch, dstPitch; -		SDL_Rect *lastRect = _dirtyRectList + _numDirtyRects; - -		for (r = _dirtyRectList; r != lastRect; ++r) { -			dst = *r; -			dst.x++;	// Shift rect by one since 2xSai needs to access the data around -			dst.y++;	// any pixel to scale it, and we want to avoid mem access crashes. - -			if (SDL_BlitSurface(origSurf, r, srcSurf, &dst) != 0) -				error("SDL_BlitSurface failed: %s", SDL_GetError()); -		} - -		SDL_LockSurface(srcSurf); -		SDL_LockSurface(_hwscreen); - -		srcPitch = srcSurf->pitch; -		dstPitch = _hwscreen->pitch; - -		for (r = _dirtyRectList; r != lastRect; ++r) { -			register int dst_y = r->y + _currentShakePos; -			register int dst_h = 0; -			register int dst_w = r->w; -			register int orig_dst_y = 0; -			register int dst_x = r->x; -			register int src_y; -			register int src_x; - -			if (dst_y < height) { -				dst_h = r->h; -				if (dst_h > height - dst_y) -					dst_h = height - dst_y; - -				orig_dst_y = dst_y; -				src_x = dst_x; -				src_y = dst_y; - -				if (_videoMode.aspectRatioCorrection && !_overlayVisible) -					dst_y = real2Aspect(dst_y); - -				assert(scalerProc != NULL); - -				if ((_videoMode.mode == GFX_HALF) && (scalerProc == DownscaleAllByHalf)) { -					if (dst_x%2==1){ -						dst_x--; -						dst_w++; -					} -					if (dst_y%2==1){ -						dst_y--; -						dst_h++; -					} -					src_x = dst_x; -					src_y = dst_y; -					dst_x = dst_x / 2; -					dst_y = dst_y / 2; - -					scalerProc((byte *)srcSurf->pixels + (src_x * 2 + 2) + (src_y + 1) * srcPitch, srcPitch, -						   (byte *)_hwscreen->pixels + dst_x * 2 + dst_y * dstPitch, dstPitch, dst_w, dst_h); -				} else { -					scalerProc((byte *)srcSurf->pixels + (r->x * 2 + 2) + (r->y + 1) * srcPitch, srcPitch, -					           (byte *)_hwscreen->pixels + r->x * 2 + dst_y * dstPitch, dstPitch, r->w, dst_h); -				} -			} - -			if (_videoMode.mode == GFX_HALF && scalerProc == DownscaleAllByHalf){ -				r->w = r->w / 2; -				r->h = dst_h / 2; -			} else { -				r->w = r->w; -				r->h = dst_h; -			} - -			r->x = dst_x; -			r->y = dst_y; - - -#ifdef USE_SCALERS -			if (_videoMode.aspectRatioCorrection && orig_dst_y < height && !_overlayVisible) -				r->h = stretch200To240((uint8 *) _hwscreen->pixels, dstPitch, r->w, r->h, r->x, r->y, orig_dst_y * scale1); -#endif -		} -		SDL_UnlockSurface(srcSurf); -		SDL_UnlockSurface(_hwscreen); - -		// Readjust the dirty rect list in case we are doing a full update. -		// This is necessary if shaking is active. -		if (_forceFull) { -			_dirtyRectList[0].y = 0; -			_dirtyRectList[0].h = (_videoMode.mode == GFX_HALF) ? effectiveScreenHeight()/2 : effectiveScreenHeight(); -		} - -		drawMouse(); - -#ifdef USE_OSD -		if (_osdAlpha != SDL_ALPHA_TRANSPARENT) { -			SDL_BlitSurface(_osdSurface, 0, _hwscreen, 0); -		} -#endif -		// Finally, blit all our changes to the screen -		SDL_UpdateRects(_hwscreen, _numDirtyRects, _dirtyRectList); -	} - -	_numDirtyRects = 0; -	_forceFull = false; -	_mouseNeedsRedraw = false; -} - -void OSystem_GPH::showOverlay() { -	if (_videoMode.mode == GFX_HALF){ -		_mouseCurState.x = _mouseCurState.x / 2; -		_mouseCurState.y = _mouseCurState.y / 2; -	} -	OSystem_SDL::showOverlay(); -} - -void OSystem_GPH::hideOverlay() { -	if (_videoMode.mode == GFX_HALF){ -		_mouseCurState.x = _mouseCurState.x * 2; -		_mouseCurState.y = _mouseCurState.y * 2; -	} -	OSystem_SDL::hideOverlay(); -} - -void OSystem_GPH::warpMouse(int x, int y) { -	if (_mouseCurState.x != x || _mouseCurState.y != y) { -		if (_videoMode.mode == GFX_HALF && !_overlayVisible){ -			x = x / 2; -			y = y / 2; -		} -	} -	OSystem_SDL::warpMouse(x, y); -} diff --git a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp b/backends/platform/gp2xwiz/gp2xwiz-hw.cpp deleted file mode 100644 index f7cc716df0..0000000000 --- a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp +++ /dev/null @@ -1,109 +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$ - * - */ - -/* - * GP2X Wiz: Hardware Stuff. - * - */ - -#include "backends/platform/gp2xwiz/gp2xwiz-hw.h" - -#include <fcntl.h> -#include <signal.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <sys/mman.h> -#include <sys/ioctl.h> -#include <sys/soundcard.h> -#include <unistd.h> - -namespace WIZ_HW { - -enum { -	VOLUME_NOCHG			= 0, -	VOLUME_DOWN				= 1, -	VOLUME_UP				= 2, -	VOLUME_CHANGE_RATE		= 8, -	VOLUME_MIN				= 0, -	VOLUME_INITIAL			= 60, -	VOLUME_MAX				= 100 -}; - -int volumeLevel = VOLUME_INITIAL; - -void deviceInit() { -} - -void deviceDeinit() { -} - -void mixerMoveVolume(int direction) { -    if (volumeLevel <= 10) { -        if (direction == VOLUME_UP)   volumeLevel += VOLUME_CHANGE_RATE/2; -        if (direction == VOLUME_DOWN) volumeLevel -= VOLUME_CHANGE_RATE/2; -    } else { -        if (direction == VOLUME_UP)   volumeLevel += VOLUME_CHANGE_RATE; -        if (direction == VOLUME_DOWN) volumeLevel -= VOLUME_CHANGE_RATE; -    } - -    if (volumeLevel < VOLUME_MIN) volumeLevel = VOLUME_MIN; -    if (volumeLevel > VOLUME_MAX) volumeLevel = VOLUME_MAX; - -    unsigned long soundDev = open("/dev/mixer", O_RDWR); - -    if (soundDev) { -        int vol = ((volumeLevel << 8) | volumeLevel); -        ioctl(soundDev, SOUND_MIXER_WRITE_PCM, &vol); -        close(soundDev); -    } -} - -} /* namespace WIZ_HW */ - -namespace GPH { - -enum { -	/* Touchscreen TapMode */ -	TAPMODE_LEFT		= 0, -	TAPMODE_RIGHT		= 1, -	TAPMODE_HOVER		= 2 -}; - -int tapmodeLevel = TAPMODE_LEFT; - -void ToggleTapMode() { -	if (tapmodeLevel == TAPMODE_LEFT) { -		tapmodeLevel = TAPMODE_RIGHT; -	} else if (tapmodeLevel == TAPMODE_RIGHT) { -		tapmodeLevel = TAPMODE_HOVER; -	} else if (tapmodeLevel == TAPMODE_HOVER) { -		tapmodeLevel = TAPMODE_LEFT; -	} else { -		tapmodeLevel = TAPMODE_LEFT; -    } -} - -} /* namespace GPH */ diff --git a/backends/platform/gp2xwiz/gp2xwiz-hw.h b/backends/platform/gp2xwiz/gp2xwiz-hw.h deleted file mode 100644 index 2fc7a85f5c..0000000000 --- a/backends/platform/gp2xwiz/gp2xwiz-hw.h +++ /dev/null @@ -1,61 +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$ - * - */ - -/* - * GP2X Wiz: Hardware Stuff. - * - */ - -#ifndef GP2XWIZ_HW_H -#define GP2XWIZ_HW_H - -#if defined (CAANOO) -	/* Vibrate features that GPH put in the */ -	/* SDL port but did not define */ -	extern void SDL_VibrateInit(); -	extern void SDL_VibrateQuit(); -	extern void SDL_VibratePlay(int); -#endif - -namespace WIZ_HW { - -extern int volumeLevel; - -extern void	deviceInit(); -extern void	deviceDeinit(); -extern void	mixerMoveVolume(int); - -} /* namespace WIZ_HW */ - -namespace GPH { - -extern int tapmodeLevel; - -extern void	ToggleTapMode(); -extern int GetTapMode(); - -} /* namespace GPH */ - -#endif //GP2XWIZ_HW_H diff --git a/backends/platform/gp2xwiz/gp2xwiz-main.cpp b/backends/platform/gp2xwiz/gp2xwiz-main.cpp deleted file mode 100644 index a40b49ae18..0000000000 --- a/backends/platform/gp2xwiz/gp2xwiz-main.cpp +++ /dev/null @@ -1,213 +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 "common/scummsys.h" -#include <SDL/SDL.h> - -#include "backends/platform/gp2xwiz/gp2xwiz-sdl.h" -#include "backends/platform/gp2xwiz/gp2xwiz-hw.h" -#include "backends/plugins/posix/posix-provider.h" -#include "base/main.h" - -#include "common/archive.h" -#include "common/config-manager.h" -#include "common/debug.h" -#include "common/events.h" -#include "common/util.h" - -#include "common/file.h" -#include "base/main.h" - -#include "backends/saves/default/default-saves.h" - -#include "backends/timer/default/default-timer.h" -#include "sound/mixer_intern.h" - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <limits.h> -#include <errno.h> -#include <sys/stat.h> -#include <time.h>	// for getTimeAndDate() - -/* Dump console info to files. */ -#define DUMP_STDOUT - -int main(int argc, char *argv[]) { -	g_system = new OSystem_GPH(); -	assert(g_system); -#ifdef DYNAMIC_MODULES -	PluginManager::instance().addPluginProvider(new POSIXPluginProvider()); -#endif - -	// Invoke the actual ScummVM main entry point: -	int res = scummvm_main(argc, argv); -	g_system->quit(); - -	return res; -} - -void OSystem_GPH::initBackend() { - -	/* Setup default save path to be workingdir/saves */ - -	char savePath[PATH_MAX+1]; -	char workDirName[PATH_MAX+1]; - -	if (getcwd(workDirName, PATH_MAX) == NULL) { -		error("Could not obtain current working directory."); -	} else { -		printf("Current working directory: %s\n", workDirName); -	} - -	strcpy(savePath, workDirName); -	strcat(savePath, "/saves"); -	printf("Current save directory: %s\n", savePath); -	struct stat sb; -	if (stat(savePath, &sb) == -1) -		if (errno == ENOENT) // Create the dir if it does not exist -			if (mkdir(savePath, 0755) != 0) -				warning("mkdir for '%s' failed!", savePath); - -	_savefile = new DefaultSaveFileManager(savePath); - -	#ifdef DUMP_STDOUT -		// The GP2X Wiz has a serial console on the breakout board but most users do not use this so we -		// output all our STDOUT and STDERR to files for debug purposes. -		char STDOUT_FILE[PATH_MAX+1]; -		char STDERR_FILE[PATH_MAX+1]; - -		strcpy(STDOUT_FILE, workDirName); -		strcpy(STDERR_FILE, workDirName); -		strcat(STDOUT_FILE, "/scummvm.stdout.txt"); -		strcat(STDERR_FILE, "/scummvm.stderr.txt"); - -		// Flush the output in case anything is queued -		fclose(stdout); -		fclose(stderr); - -		// Redirect standard input and standard output -		FILE *newfp = freopen(STDOUT_FILE, "w", stdout); -		if (newfp == NULL) { -		#if !defined(stdout) -			stdout = fopen(STDOUT_FILE, "w"); -		#else -			newfp = fopen(STDOUT_FILE, "w"); -			if (newfp) { -				*stdout = *newfp; -			} -		#endif -		} - -		newfp = freopen(STDERR_FILE, "w", stderr); -		if (newfp == NULL) { -		#if !defined(stderr) -			stderr = fopen(STDERR_FILE, "w"); -		#else -			newfp = fopen(STDERR_FILE, "w"); -			if (newfp) { -				*stderr = *newfp; -			} -		#endif -		} - -		setbuf(stderr, NULL); -		printf("%s\n", "Debug: STDOUT and STDERR redirected to text files."); -	#endif /* DUMP_STDOUT */ - -	/* Initialise any GP2X Wiz specific stuff we may want (Batt Status, scaler etc.) */ -	WIZ_HW::deviceInit(); - -	/* Set Default hardware mixer volume to a preset level (VOLUME_INITIAL). This is done to 'reset' volume level if set by other apps. */ -	WIZ_HW::mixerMoveVolume(0); - -	/* Up default volume values as we use a seperate system level volume anyway. */ -	ConfMan.registerDefault("music_volume", 192); -	ConfMan.registerDefault("sfx_volume", 192); -	ConfMan.registerDefault("speech_volume", 192); - -	/* Trigger autosave every 4 minutes - On low batts 5 mins is about your warning time. */ -	ConfMan.registerDefault("autosave_period", 4 * 60); - -	/* Make sure that aspect ratio correction is enabled on the 1st run to stop users asking me what the 'wasted space' is ;-). */ -	ConfMan.registerDefault("aspect_ratio", true); - -	/* Make sure SDL knows that we have a joystick we want to use. */ -	ConfMan.setInt("joystick_num", 0); - -	printf("%s\n", "Passing to OSystem::SDL initBackend."); - -	/* Pass to SDL backend to do the heavy lifting */ -	OSystem_SDL::initBackend(); -} - -void OSystem_GPH::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) { - -	/* Setup default extra data paths for engine data files and plugins */ -	char workDirName[PATH_MAX+1]; - -	if (getcwd(workDirName, PATH_MAX) == NULL) { -		error("Error: Could not obtain current working directory."); -	} - -	Common::FSNode workdirNode(workDirName); -	if (workdirNode.exists() && workdirNode.isDirectory()) { -		s.add("__GP2XWIZ_WORKDIR__", new Common::FSDirectory(workDirName), priority); -	} - -	char enginedataPath[PATH_MAX+1]; - -	strcpy(enginedataPath, workDirName); -	strcat(enginedataPath, "/engine-data"); - -	Common::FSNode engineNode(enginedataPath); -	if (engineNode.exists() && engineNode.isDirectory()) { -		s.add("__GP2XWIZ_ENGDATA__", new Common::FSDirectory(enginedataPath), priority); -	} - -	char pluginsPath[PATH_MAX+1]; - -	strcpy(pluginsPath, workDirName); -	strcat(pluginsPath, "/plugins"); - -	Common::FSNode pluginsNode(pluginsPath); -	if (pluginsNode.exists() && pluginsNode.isDirectory()) { -		s.add("__GP2XWIZ_PLUGINS__", new Common::FSDirectory(pluginsPath), priority); -	} -} - -void OSystem_GPH::quit() { - -	WIZ_HW::deviceDeinit(); - -	#ifdef DUMP_STDOUT -		printf("%s\n", "Debug: STDOUT and STDERR text files closed."); -		fclose(stdout); -		fclose(stderr); -	#endif /* DUMP_STDOUT */ - -	OSystem_SDL::quit(); -} diff --git a/backends/platform/gp2xwiz/gp2xwiz-sdl.h b/backends/platform/gp2xwiz/gp2xwiz-sdl.h deleted file mode 100644 index bae9a87771..0000000000 --- a/backends/platform/gp2xwiz/gp2xwiz-sdl.h +++ /dev/null @@ -1,81 +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$ - * - */ - -#ifndef GP2XWIZ_SDL_H -#define GP2XWIZ_SDL_H - -#include "backends/platform/sdl/sdl.h" - -// FIXME: For now keep hacks in this header to save polluting the SDL backend. -enum { -    GFX_HALF = 12 -}; - -#define __GP2XWIZ__ -#define MIXER_DOUBLE_BUFFERING 1 - -#ifndef PATH_MAX -	#define PATH_MAX 255 -#endif - -class OSystem_GPH : public OSystem_SDL { -public: -	OSystem_GPH() {} - -	/* Graphics */ -    void initSize(uint w, uint h); -    void setGraphicsModeIntern(); -    bool setGraphicsMode(int mode); -    void internUpdateScreen(); -    const OSystem::GraphicsMode *getSupportedGraphicsModes() const; -	bool setGraphicsMode(const char *name); -    int getDefaultGraphicsMode() const; -    bool loadGFXMode(); -    void drawMouse(); -    void undrawMouse(); -    void showOverlay(); -    void hideOverlay(); - -	/* Event Stuff */ -	void moveStick(); -	void fillMouseEvent(Common::Event&, int, int); -	void warpMouse(int, int); -	bool remapKey(SDL_Event&, Common::Event&); - -	/* Platform Setup Stuff */ -	void addSysArchivesToSearchSet(Common::SearchSet &s, int priority); -	void initBackend(); -	void quit(); - -protected: -	bool _stickBtn[32]; - -	bool handleMouseButtonDown(SDL_Event &ev, Common::Event &event); -	bool handleMouseButtonUp(SDL_Event &ev, Common::Event &event); -	bool handleJoyButtonDown(SDL_Event &ev, Common::Event &event); -	bool handleJoyButtonUp(SDL_Event &ev, Common::Event &event); -}; - -#endif diff --git a/backends/platform/gp2xwiz/module.mk b/backends/platform/gp2xwiz/module.mk deleted file mode 100644 index edf2f2a717..0000000000 --- a/backends/platform/gp2xwiz/module.mk +++ /dev/null @@ -1,15 +0,0 @@ -MODULE := backends/platform/gp2xwiz - -MODULE_OBJS := \ -	gp2xwiz-events.o \ -	gp2xwiz-graphics.o \ -	gp2xwiz-hw.o \ -	gp2xwiz-main.o - -# We don't use rules.mk but rather manually update OBJS and MODULE_DIRS. -MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) -OBJS := $(MODULE_OBJS) $(OBJS) -MODULE_DIRS += $(sort $(dir $(MODULE_OBJS))) - -# Hack to ensure the SDL backend is built so we can use OSystem_SDL. --include $(srcdir)/backends/platform/sdl/module.mk
\ No newline at end of file  | 
