thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
vanfanel 2015-10-18 20:25:53 +02:00
parent a4bfef8c53
commit c362119572
9 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp
View file

@ -25,7 +25,7 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#if defined(RASPBERRYPI) #if defined(DISPMANX)
#include "backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h" #include "backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h"
#include "graphics/scaler/aspect.h" #include "graphics/scaler/aspect.h"

2
backends/module.mk
View file

@ -127,7 +127,7 @@ MODULE_OBJS += \
mixer/sdl13/sdl13-mixer.o mixer/sdl13/sdl13-mixer.o
endif endif
ifdef RASPBERRYPI ifdef DISPMANX
MODULE_OBJS += \ MODULE_OBJS += \
graphics/dispmanxsdl/dispmanxsdl-graphics.o graphics/dispmanxsdl/dispmanxsdl-graphics.o
endif endif

2
backends/platform/sdl/module.mk
View file

@ -34,7 +34,7 @@ MODULE_OBJS += \
ps3/ps3.o ps3/ps3.o
endif endif
ifdef RASPBERRYPI ifdef DISPMANX
MODULE_OBJS += \ MODULE_OBJS += \
raspberrypi/raspberrypi-main.o \ raspberrypi/raspberrypi-main.o \
raspberrypi/raspberrypi.o raspberrypi/raspberrypi.o

2
backends/platform/sdl/posix/posix-main.cpp
View file

@ -22,7 +22,7 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(RASPBERRYPI) #if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(DISPMANX)
#include "backends/platform/sdl/posix/posix.h" #include "backends/platform/sdl/posix/posix.h"
#include "backends/plugins/sdl/sdl-provider.h" #include "backends/plugins/sdl/sdl-provider.h"

1
backends/platform/sdl/raspberrypi/README.RASPBERRYPI
View file

@ -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 (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 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. 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! Enjoy!

2
backends/platform/sdl/raspberrypi/raspberrypi-main.cpp
View file

@ -25,7 +25,7 @@
#include "common/scummsys.h" #include "common/scummsys.h"
#include "base/main.h" #include "base/main.h"
#if defined(RASPBERRYPI) #if defined(DISPMANX)
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
// Create our OSystem instance // Create our OSystem instance

2
backends/platform/sdl/raspberrypi/raspberrypi.cpp
View file

@ -20,7 +20,7 @@
* *
*/ */
#if defined(RASPBERRYPI) #if defined(DISPMANX)
#include "backends/platform/sdl/raspberrypi/raspberrypi.h" #include "backends/platform/sdl/raspberrypi/raspberrypi.h"
#include "backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h" #include "backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h"

10
backends/platform/sdl/raspberrypi/raspberrypi.h
View file

@ -20,10 +20,10 @@
* *
*/ */
#ifndef SDL_RASPBERRYPI_COMMON_H #ifndef SDL_DISPMANX_COMMON_H
#define SDL_RASPBERRYPI_COMMON_H #define SDL_DISPMANX_COMMON_H
#if defined(RASPBERRYPI) #if defined(DISPMANX)
#include "backends/platform/sdl/posix/posix.h" #include "backends/platform/sdl/posix/posix.h"
class OSystem_SDL_RaspberryPi : public OSystem_POSIX { class OSystem_SDL_RaspberryPi : public OSystem_POSIX {
@ -31,5 +31,5 @@ public:
void initBackend(); void initBackend();
}; };
#endif /* RASPBERRYPI */ #endif /* DISPMANX */
#endif /* SDL_RASPBERRYPI_COMMON_H */ #endif /* SDL_DISPMANX_COMMON_H */

5
configure vendored
View file

@ -4081,6 +4081,7 @@ define_in_config_if_yes "$_opengl" "USE_OPENGL"
define_in_config_if_yes "$_opengles" "USE_GLES" define_in_config_if_yes "$_opengles" "USE_GLES"
# Check if Raspberry Pi's Dispmanx graphics have been enabled and everything is in place. # Check if Raspberry Pi's Dispmanx graphics have been enabled and everything is in place.
# If dispmanx is disabled, we fall back to plain SDL rendering.
if test "$_dispmanx" = "yes" ; then if test "$_dispmanx" = "yes" ; then
echocheck "DispmanX graphics" echocheck "DispmanX graphics"
_use_dispmanx=no _use_dispmanx=no
@ -4101,8 +4102,8 @@ EOF
if test "$_use_dispmanx" = "yes"; then if test "$_use_dispmanx" = "yes"; then
CXXFLAGS="$CXXFLAGS $DISPMANX_CXXFLAGS" CXXFLAGS="$CXXFLAGS $DISPMANX_CXXFLAGS"
LIBS="$LIBS $DISPMANX_LIBS" LIBS="$LIBS $DISPMANX_LIBS"
DEFINES="$DEFINES -DRASPBERRYPI" DEFINES="$DEFINES -DDISPMANX"
add_line_to_config_mk 'RASPBERRYPI = 1' add_line_to_config_mk 'DISPMANX = 1'
echo $_use_dispmanx echo $_use_dispmanx
else echo "no" else echo "no"
fi fi