diff options
| -rw-r--r-- | backends/platform/gph/build/gp2xwiz-bundle.sh | 10 | ||||
| -rw-r--r-- | backends/platform/gph/gph-backend.cpp | 11 | ||||
| -rw-r--r-- | backends/platform/gph/gph-main.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/gph/gph.h (renamed from backends/platform/gph/gph-sdl.h) | 0 |
4 files changed, 15 insertions, 8 deletions
diff --git a/backends/platform/gph/build/gp2xwiz-bundle.sh b/backends/platform/gph/build/gp2xwiz-bundle.sh index 579e2dc77b..2182f207c3 100644 --- a/backends/platform/gph/build/gp2xwiz-bundle.sh +++ b/backends/platform/gph/build/gp2xwiz-bundle.sh @@ -2,6 +2,16 @@ echo Quick script to make building a distribution of the GP2X Wiz backend 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. diff --git a/backends/platform/gph/gph-backend.cpp b/backends/platform/gph/gph-backend.cpp index ae3466b836..8ee84ed6c0 100644 --- a/backends/platform/gph/gph-backend.cpp +++ b/backends/platform/gph/gph-backend.cpp @@ -25,10 +25,9 @@ #include "backends/platform/sdl/sdl-sys.h" -// #include "backends/platform/gph/gph-options.h" #include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h" #include "backends/platform/gph/gph-hw.h" -#include "backends/platform/gph/gph-sdl.h" +#include "backends/platform/gph/gph.h" #include "backends/plugins/posix/posix-provider.h" #include "backends/saves/default/default-saves.h" #include "backends/timer/default/default-timer.h" @@ -105,8 +104,9 @@ void OSystem_GPH::initBackend() { _savefileManager = 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. + // The GPH devices have 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]; @@ -169,9 +169,6 @@ void OSystem_GPH::initBackend() { /* Make sure SDL knows that we have a joystick we want to use. */ ConfMan.setInt("joystick_num", 0); - /* Now setup any device specific user options (Left handed mode, that sort of thing). */ - // GPH::setOptions(); - /* Pass to POSIX method to do the heavy lifting */ OSystem_POSIX::initBackend(); diff --git a/backends/platform/gph/gph-main.cpp b/backends/platform/gph/gph-main.cpp index 1a8c6686ca..4f290f71ed 100644 --- a/backends/platform/gph/gph-main.cpp +++ b/backends/platform/gph/gph-main.cpp @@ -20,7 +20,7 @@ * */ -#include "backends/platform/gph/gph-sdl.h" +#include "backends/platform/gph/gph.h" #include "backends/plugins/posix/posix-provider.h" #include "base/main.h" diff --git a/backends/platform/gph/gph-sdl.h b/backends/platform/gph/gph.h index 8b943f98f3..8b943f98f3 100644 --- a/backends/platform/gph/gph-sdl.h +++ b/backends/platform/gph/gph.h |