From 08a3376ba7bdcd262131eafa5ae5e4e8a4ecf18d Mon Sep 17 00:00:00 2001 From: vanfanel Date: Tue, 27 Jan 2015 17:58:08 +0100 Subject: RASPBERRYPI: Added Raspberry Pi native 2D API support (dispmanx) --- .../platform/sdl/raspberrypi/raspberrypi-main.cpp | 51 ++++++++++++++++++++++ backends/platform/sdl/raspberrypi/raspberrypi.cpp | 42 ++++++++++++++++++ backends/platform/sdl/raspberrypi/raspberrypi.h | 35 +++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 backends/platform/sdl/raspberrypi/raspberrypi-main.cpp create mode 100644 backends/platform/sdl/raspberrypi/raspberrypi.cpp create mode 100644 backends/platform/sdl/raspberrypi/raspberrypi.h (limited to 'backends/platform/sdl/raspberrypi') diff --git a/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp b/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp new file mode 100644 index 0000000000..7d2eff916d --- /dev/null +++ b/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp @@ -0,0 +1,51 @@ +/* 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. + * + */ + +#include "backends/platform/sdl/raspberrypi/raspberrypi.h" +#include "backends/plugins/sdl/sdl-provider.h" +#include "common/scummsys.h" +#include "base/main.h" + +#if defined(RASPBERRYPI) +int main(int argc, char* argv[]) { + + // Create our OSystem instance + g_system = new OSystem_SDL_RaspberryPi(); + assert(g_system); + + // Pre initialize the backend + ((OSystem_SDL_RaspberryPi *)g_system)->init(); + +#ifdef DYNAMIC_MODULES + PluginManager::instance().addPluginProvider(new SDLPluginProvider()); +#endif + + // Invoke the actual ScummVM main entry point: + int res = scummvm_main(argc, argv); + + // Free OSystem + delete (OSystem_SDL_RaspberryPi *)g_system; + + return res; +} + +#endif diff --git a/backends/platform/sdl/raspberrypi/raspberrypi.cpp b/backends/platform/sdl/raspberrypi/raspberrypi.cpp new file mode 100644 index 0000000000..2405dfaf43 --- /dev/null +++ b/backends/platform/sdl/raspberrypi/raspberrypi.cpp @@ -0,0 +1,42 @@ +/* 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. + * + */ + +#if defined(RASPBERRYPI) + +#include "backends/platform/sdl/raspberrypi/raspberrypi.h" +#include "backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h" + +void OSystem_SDL_RaspberryPi::initBackend() { + // Create the events manager + if (_eventSource == 0) + _eventSource = new SdlEventSource(); + + // Create the graphics manager + if (_graphicsManager == 0) { + _graphicsManager = new DispmanXSdlGraphicsManager(_eventSource); + } + + // Call parent implementation of this method + OSystem_POSIX::initBackend(); +} + +#endif diff --git a/backends/platform/sdl/raspberrypi/raspberrypi.h b/backends/platform/sdl/raspberrypi/raspberrypi.h new file mode 100644 index 0000000000..b8070e8b5a --- /dev/null +++ b/backends/platform/sdl/raspberrypi/raspberrypi.h @@ -0,0 +1,35 @@ +/* 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. + * + */ + +#ifndef SDL_RASPBERRYPI_COMMON_H +#define SDL_RASPBERRYPI_COMMON_H + +#if defined(RASPBERRYPI) +#include "backends/platform/sdl/posix/posix.h" + +class OSystem_SDL_RaspberryPi : public OSystem_POSIX { +public: + void initBackend(); +}; + +#endif /* RASPBERRYPI */ +#endif /* SDL_RASPBERRYPI_COMMON_H */ -- cgit v1.2.3 From bf68de9aa7c3131ffac65b15d5e971788c7fe9c9 Mon Sep 17 00:00:00 2001 From: vanfanel Date: Thu, 9 Apr 2015 15:16:39 +0200 Subject: RASPBERRYPI: Changed the RGB code for the game screen surface and added RaspberryPi information file. --- .../platform/sdl/raspberrypi/README.RASPBERRYPI | 100 +++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 backends/platform/sdl/raspberrypi/README.RASPBERRYPI (limited to 'backends/platform/sdl/raspberrypi') diff --git a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI new file mode 100644 index 0000000000..f7143805a8 --- /dev/null +++ b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI @@ -0,0 +1,100 @@ +ScummVM-RASPBERRYPI README +============================================================================== + +Notes +============ + +This version of ScummVM is specially tailored to use DispmanX, the native 2D +API on the Raspberry Pi. The idea is that scaling and drawing on a double +buffer with a non-blocking vsync wait is all done using the on-board VideoCore +hardware, thus using only a small fraction of the CPU ScummVM uses when ran +on a clunky, software-scaled and desynced X11 enviroment using the X11 API. +Thus, running this version under an X11 session is not supported. + +Requirements +============ +- Raspberry Pi 1 or 2 microcomputer. +- Raspbian (Debian) installed on SD card. Other distros may be supported if + they include the VideoCore runtime libraries that Raspbian includes. +-An attached keyboard and mouse, or alternatively joystick. + +Controls +============ + +The standard ScummVM keyboard and mouse controls are used as in any other +GNU/Linux based system. +Use the --joystick parameter if you want to use a joystick instead of the +intended mouse for playing the games (not recommended). + +Installation from binaries +============================== + +We have at least three methods to get the binaries into the Raspbian SD: + +1) Since Debian (Raspbian) includes an ssh service by default, I recommend +keeping the SD card on the Raspberry Pi, and using scp to copy the package over +to your home directory in the Debian filesystem. + +scp scummvm-rpi_.zip pi@:/home/pi + +2) If your RaspberryPi has internet access, you can simply use wget to +download the package to your home folder: + +cd ~/ +wget + +3) You could also connect the Raspbian SD card to your main PC and, after +mounting it (or being automounted as it would be in most desktop GNU/Linux +systems), copy the package file manually to your home directory. +How to mount an SD and copy files to it is beyond the scope of this README. + +Once we have the package file in our home directory using one of the three +aforementioned methods, we would need to uncompress it: + +unzip scummvm-rpi_.zip + +As a result, a directory containing the scummvm along with this README will be +created. +We can run it by simply changing to our scummvm directory and executing the +scummvm file. + +cd scummvm-rpi +./scummvm + +I recommend copying the games to /home/pi/scummvm-rpi. Adding the games via the menu +works as in any other system ScummVM runs on. + +Building from sources +============================== + +We have two options to build once we have the sources in our main GNU/Linux desktop +class PC or in our Raspberry Pi: + +1) Building on the Raspberry Pi itself, although possible, is an SLOW task for the +little computer unless you use distributed gcc (or distcc for short). + +Local compilation would simply consist of the "standard" GNU/Linux building process: + +cd + +./configure ./configure --backend=raspberrypi -disable-debug --enable-release +--enable-optimizations --disable-mt32emu --disable-flac --disable-mad --disable-vorbis +--disable-tremor --disable-fluidsynth --disable-taskbar --disable-timidity --disable-alsa + +make + +¡¡It will be an SLOW process, taking several hours to complete, unless you +are running distcc against a fast compilation server!! + +2) If we wandt to build by cross-compiling on a GNU/Linux X86-based computer, +we can find concise instructions for this can be found on the ScummVM wiki: + +http://wiki.scummvm.org/index.php/Compiling_ScummVM/RPI + +NOTE: Distcc is my preferred method as it does cross-compiling totally transparent +(we build ON the Pi but the actual CPU-intensive compilation is made on an external +server), but it involves building a custom gcc version on the compilation server and +configuring a server and client in both the Raspberry Pi and the server. +More info here: http://elinux.org/RPi_Linaro_GCC_Compilation#Build_GCC_Linaro + +Enjoy! -- cgit v1.2.3 From b706ca36f1e40d01e50d99d3e1296470f0727f3f Mon Sep 17 00:00:00 2001 From: vanfanel Date: Wed, 22 Jul 2015 13:00:45 +0200 Subject: SDL/DISPMANX: Updated class member names, configure script and asociated files and docs to conform to fingolfin's corrections. --- backends/platform/sdl/raspberrypi/README.RASPBERRYPI | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'backends/platform/sdl/raspberrypi') diff --git a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI index f7143805a8..d67a5ab939 100644 --- a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI +++ b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI @@ -8,7 +8,7 @@ This version of ScummVM is specially tailored to use DispmanX, the native 2D API on the Raspberry Pi. The idea is that scaling and drawing on a double buffer with a non-blocking vsync wait is all done using the on-board VideoCore hardware, thus using only a small fraction of the CPU ScummVM uses when ran -on a clunky, software-scaled and desynced X11 enviroment using the X11 API. +on a clunky, software-scaled and desynced X11 environment using the X11 API. Thus, running this version under an X11 session is not supported. Requirements @@ -77,7 +77,7 @@ Local compilation would simply consist of the "standard" GNU/Linux building proc cd -./configure ./configure --backend=raspberrypi -disable-debug --enable-release +./configure --backend=raspberrypi -disable-debug --enable-release --enable-optimizations --disable-mt32emu --disable-flac --disable-mad --disable-vorbis --disable-tremor --disable-fluidsynth --disable-taskbar --disable-timidity --disable-alsa @@ -86,7 +86,7 @@ make ¡¡It will be an SLOW process, taking several hours to complete, unless you are running distcc against a fast compilation server!! -2) If we wandt to build by cross-compiling on a GNU/Linux X86-based computer, +2) If we want to build by cross-compiling on a GNU/Linux X86-based computer, we can find concise instructions for this can be found on the ScummVM wiki: http://wiki.scummvm.org/index.php/Compiling_ScummVM/RPI -- cgit v1.2.3 From c362119572228721e45087d1a835231512b8edab Mon Sep 17 00:00:00 2001 From: vanfanel Date: Sun, 18 Oct 2015 20:25:53 +0200 Subject: SDL/DISPMANX Renamed the RASBERRYPI define to the less confusing name of DISPMANX because it controls whether dispmanx rendering backend is enabled or not on the Raspberry Pi. --- backends/platform/sdl/raspberrypi/README.RASPBERRYPI | 1 - backends/platform/sdl/raspberrypi/raspberrypi-main.cpp | 2 +- backends/platform/sdl/raspberrypi/raspberrypi.cpp | 2 +- backends/platform/sdl/raspberrypi/raspberrypi.h | 10 +++++----- 4 files changed, 7 insertions(+), 8 deletions(-) (limited to 'backends/platform/sdl/raspberrypi') diff --git a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI index d67a5ab939..1b3a30c8aa 100644 --- a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI +++ b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI @@ -95,6 +95,5 @@ NOTE: Distcc is my preferred method as it does cross-compiling totally transpare (we build ON the Pi but the actual CPU-intensive compilation is made on an external server), but it involves building a custom gcc version on the compilation server and configuring a server and client in both the Raspberry Pi and the server. -More info here: http://elinux.org/RPi_Linaro_GCC_Compilation#Build_GCC_Linaro Enjoy! diff --git a/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp b/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp index 7d2eff916d..cddbcb7ec4 100644 --- a/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp +++ b/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp @@ -25,7 +25,7 @@ #include "common/scummsys.h" #include "base/main.h" -#if defined(RASPBERRYPI) +#if defined(DISPMANX) int main(int argc, char* argv[]) { // Create our OSystem instance diff --git a/backends/platform/sdl/raspberrypi/raspberrypi.cpp b/backends/platform/sdl/raspberrypi/raspberrypi.cpp index 2405dfaf43..a3f79fd5b3 100644 --- a/backends/platform/sdl/raspberrypi/raspberrypi.cpp +++ b/backends/platform/sdl/raspberrypi/raspberrypi.cpp @@ -20,7 +20,7 @@ * */ -#if defined(RASPBERRYPI) +#if defined(DISPMANX) #include "backends/platform/sdl/raspberrypi/raspberrypi.h" #include "backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h" diff --git a/backends/platform/sdl/raspberrypi/raspberrypi.h b/backends/platform/sdl/raspberrypi/raspberrypi.h index b8070e8b5a..45e2c505f6 100644 --- a/backends/platform/sdl/raspberrypi/raspberrypi.h +++ b/backends/platform/sdl/raspberrypi/raspberrypi.h @@ -20,10 +20,10 @@ * */ -#ifndef SDL_RASPBERRYPI_COMMON_H -#define SDL_RASPBERRYPI_COMMON_H +#ifndef SDL_DISPMANX_COMMON_H +#define SDL_DISPMANX_COMMON_H -#if defined(RASPBERRYPI) +#if defined(DISPMANX) #include "backends/platform/sdl/posix/posix.h" class OSystem_SDL_RaspberryPi : public OSystem_POSIX { @@ -31,5 +31,5 @@ public: void initBackend(); }; -#endif /* RASPBERRYPI */ -#endif /* SDL_RASPBERRYPI_COMMON_H */ +#endif /* DISPMANX */ +#endif /* SDL_DISPMANX_COMMON_H */ -- cgit v1.2.3 From c2c95cc95b779113a6af43a40d8f1ea486e572d8 Mon Sep 17 00:00:00 2001 From: vanfanel Date: Mon, 19 Oct 2015 12:12:54 +0200 Subject: SDL/DISPMANX Fixed dispmanx activation parameter on README.RASPBERRYPI --- backends/platform/sdl/raspberrypi/README.RASPBERRYPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/sdl/raspberrypi') diff --git a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI index 1b3a30c8aa..82217b7d7d 100644 --- a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI +++ b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI @@ -77,7 +77,7 @@ Local compilation would simply consist of the "standard" GNU/Linux building proc cd -./configure --backend=raspberrypi -disable-debug --enable-release +./configure --enable-dispmanx -disable-debug --enable-release --enable-optimizations --disable-mt32emu --disable-flac --disable-mad --disable-vorbis --disable-tremor --disable-fluidsynth --disable-taskbar --disable-timidity --disable-alsa -- cgit v1.2.3 From 37e157a11c3fc731dfdcf6ec6b6a5a448550219b Mon Sep 17 00:00:00 2001 From: vanfanel Date: Tue, 20 Oct 2015 21:15:26 +0200 Subject: SDL/DISPMANX Make additional notes on README.RASPBERRYPI telling users to manually disable some features that are sub-optimal on the Pi when they don't pass a host parameter --- backends/platform/sdl/raspberrypi/README.RASPBERRYPI | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'backends/platform/sdl/raspberrypi') diff --git a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI index 82217b7d7d..f8d872b519 100644 --- a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI +++ b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI @@ -79,10 +79,17 @@ cd ./configure --enable-dispmanx -disable-debug --enable-release --enable-optimizations --disable-mt32emu --disable-flac --disable-mad --disable-vorbis ---disable-tremor --disable-fluidsynth --disable-taskbar --disable-timidity --disable-alsa +--disable-tremor --disable-fluidsynth --disable-taskbar --disable-timidity --disable-alsa +--disable-scalers --disable-hq-scalers --disable-savegame-timestamp --disable-eventrecorder make +As you can see, we're manually disabling scalers because we prefer dispmanx for that, which +makes scalers unnecessary on a CPU limited platform like this, timestamps because most people +doesn't have an RTC on the Raspberry Pi, and event recorder to save SD card write cycles. +All these are automatically disabled when we crosscompile by passing "--host=raspberrypi", +which is not the case. + ¡¡It will be an SLOW process, taking several hours to complete, unless you are running distcc against a fast compilation server!! -- cgit v1.2.3 From 9d831d0c428df4f21272a3b7df2d1016f657b63f Mon Sep 17 00:00:00 2001 From: vanfanel Date: Thu, 12 Nov 2015 14:03:14 +0100 Subject: SDL/DISPMANX Fixed small issues with merging: Use append_var, fix spacing issues and changed SurfaceSdlGraphicsManager constructor call parameters on DispmanXSdlGraphicsManager constructor. --- backends/platform/sdl/raspberrypi/raspberrypi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/sdl/raspberrypi') diff --git a/backends/platform/sdl/raspberrypi/raspberrypi.cpp b/backends/platform/sdl/raspberrypi/raspberrypi.cpp index a3f79fd5b3..206203d82e 100644 --- a/backends/platform/sdl/raspberrypi/raspberrypi.cpp +++ b/backends/platform/sdl/raspberrypi/raspberrypi.cpp @@ -32,7 +32,7 @@ void OSystem_SDL_RaspberryPi::initBackend() { // Create the graphics manager if (_graphicsManager == 0) { - _graphicsManager = new DispmanXSdlGraphicsManager(_eventSource); + _graphicsManager = new DispmanXSdlGraphicsManager(_eventSource, _window); } // Call parent implementation of this method -- cgit v1.2.3 From 66dbb7f485899a555093e1b909d65c97589a5681 Mon Sep 17 00:00:00 2001 From: vanfanel Date: Fri, 4 Dec 2015 16:05:19 +0100 Subject: SDL/DISPMANX: Remove dispmanx graphics output. --- .../platform/sdl/raspberrypi/README.RASPBERRYPI | 45 ++++--------------- .../platform/sdl/raspberrypi/raspberrypi-main.cpp | 51 ---------------------- backends/platform/sdl/raspberrypi/raspberrypi.cpp | 42 ------------------ backends/platform/sdl/raspberrypi/raspberrypi.h | 35 --------------- 4 files changed, 8 insertions(+), 165 deletions(-) delete mode 100644 backends/platform/sdl/raspberrypi/raspberrypi-main.cpp delete mode 100644 backends/platform/sdl/raspberrypi/raspberrypi.cpp delete mode 100644 backends/platform/sdl/raspberrypi/raspberrypi.h (limited to 'backends/platform/sdl/raspberrypi') diff --git a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI index f8d872b519..ab0e674c31 100644 --- a/backends/platform/sdl/raspberrypi/README.RASPBERRYPI +++ b/backends/platform/sdl/raspberrypi/README.RASPBERRYPI @@ -4,12 +4,9 @@ ScummVM-RASPBERRYPI README Notes ============ -This version of ScummVM is specially tailored to use DispmanX, the native 2D -API on the Raspberry Pi. The idea is that scaling and drawing on a double -buffer with a non-blocking vsync wait is all done using the on-board VideoCore -hardware, thus using only a small fraction of the CPU ScummVM uses when ran -on a clunky, software-scaled and desynced X11 environment using the X11 API. -Thus, running this version under an X11 session is not supported. +This version of ScummVM uses SDL2 hardware accelerated graphics, be it +plain SDL2 which in turn uses dispmanx/gles2 or by using gles1 via an +SDL2-configured GLES1 context. Requirements ============ @@ -67,40 +64,14 @@ works as in any other system ScummVM runs on. Building from sources ============================== -We have two options to build once we have the sources in our main GNU/Linux desktop -class PC or in our Raspberry Pi: +Recommended method is building by cross-compiling on a GNU/Linux X86-based computer. +You can find concise instructions for this on the ScummVM wiki: -1) Building on the Raspberry Pi itself, although possible, is an SLOW task for the -little computer unless you use distributed gcc (or distcc for short). - -Local compilation would simply consist of the "standard" GNU/Linux building process: - -cd - -./configure --enable-dispmanx -disable-debug --enable-release ---enable-optimizations --disable-mt32emu --disable-flac --disable-mad --disable-vorbis ---disable-tremor --disable-fluidsynth --disable-taskbar --disable-timidity --disable-alsa ---disable-scalers --disable-hq-scalers --disable-savegame-timestamp --disable-eventrecorder - -make +http://wiki.scummvm.org/index.php/Compiling_ScummVM/RPI -As you can see, we're manually disabling scalers because we prefer dispmanx for that, which +The configure script is disabling scalers because we prefer dispmanx for that, which makes scalers unnecessary on a CPU limited platform like this, timestamps because most people doesn't have an RTC on the Raspberry Pi, and event recorder to save SD card write cycles. -All these are automatically disabled when we crosscompile by passing "--host=raspberrypi", -which is not the case. - -¡¡It will be an SLOW process, taking several hours to complete, unless you -are running distcc against a fast compilation server!! - -2) If we want to build by cross-compiling on a GNU/Linux X86-based computer, -we can find concise instructions for this can be found on the ScummVM wiki: - -http://wiki.scummvm.org/index.php/Compiling_ScummVM/RPI - -NOTE: Distcc is my preferred method as it does cross-compiling totally transparent -(we build ON the Pi but the actual CPU-intensive compilation is made on an external -server), but it involves building a custom gcc version on the compilation server and -configuring a server and client in both the Raspberry Pi and the server. +All these are automatically disabled when we crosscompile by passing "--host=raspberrypi". Enjoy! diff --git a/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp b/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp deleted file mode 100644 index cddbcb7ec4..0000000000 --- a/backends/platform/sdl/raspberrypi/raspberrypi-main.cpp +++ /dev/null @@ -1,51 +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. - * - */ - -#include "backends/platform/sdl/raspberrypi/raspberrypi.h" -#include "backends/plugins/sdl/sdl-provider.h" -#include "common/scummsys.h" -#include "base/main.h" - -#if defined(DISPMANX) -int main(int argc, char* argv[]) { - - // Create our OSystem instance - g_system = new OSystem_SDL_RaspberryPi(); - assert(g_system); - - // Pre initialize the backend - ((OSystem_SDL_RaspberryPi *)g_system)->init(); - -#ifdef DYNAMIC_MODULES - PluginManager::instance().addPluginProvider(new SDLPluginProvider()); -#endif - - // Invoke the actual ScummVM main entry point: - int res = scummvm_main(argc, argv); - - // Free OSystem - delete (OSystem_SDL_RaspberryPi *)g_system; - - return res; -} - -#endif diff --git a/backends/platform/sdl/raspberrypi/raspberrypi.cpp b/backends/platform/sdl/raspberrypi/raspberrypi.cpp deleted file mode 100644 index 206203d82e..0000000000 --- a/backends/platform/sdl/raspberrypi/raspberrypi.cpp +++ /dev/null @@ -1,42 +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. - * - */ - -#if defined(DISPMANX) - -#include "backends/platform/sdl/raspberrypi/raspberrypi.h" -#include "backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h" - -void OSystem_SDL_RaspberryPi::initBackend() { - // Create the events manager - if (_eventSource == 0) - _eventSource = new SdlEventSource(); - - // Create the graphics manager - if (_graphicsManager == 0) { - _graphicsManager = new DispmanXSdlGraphicsManager(_eventSource, _window); - } - - // Call parent implementation of this method - OSystem_POSIX::initBackend(); -} - -#endif diff --git a/backends/platform/sdl/raspberrypi/raspberrypi.h b/backends/platform/sdl/raspberrypi/raspberrypi.h deleted file mode 100644 index 45e2c505f6..0000000000 --- a/backends/platform/sdl/raspberrypi/raspberrypi.h +++ /dev/null @@ -1,35 +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. - * - */ - -#ifndef SDL_DISPMANX_COMMON_H -#define SDL_DISPMANX_COMMON_H - -#if defined(DISPMANX) -#include "backends/platform/sdl/posix/posix.h" - -class OSystem_SDL_RaspberryPi : public OSystem_POSIX { -public: - void initBackend(); -}; - -#endif /* DISPMANX */ -#endif /* SDL_DISPMANX_COMMON_H */ -- cgit v1.2.3