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.

9 files changed, 14 insertions, 14 deletions

diff --git a/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp b/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp
index 28f1cc1367..7e208db4b7 100644
--- a/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp
+++ b/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp
@@ -25,7 +25,7 @@
 
 #include "common/scummsys.h"
 
-#if defined(RASPBERRYPI)
+#if defined(DISPMANX)
 
 #include "backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h"
 #include "graphics/scaler/aspect.h"
diff --git a/backends/module.mk b/backends/module.mk
index 979bce56ea..8f3677fbf9 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -127,7 +127,7 @@ MODULE_OBJS += \
 	mixer/sdl13/sdl13-mixer.o
 endif
 
-ifdef RASPBERRYPI
+ifdef DISPMANX
 MODULE_OBJS += \
 	graphics/dispmanxsdl/dispmanxsdl-graphics.o
 endif
diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk
index d87ec6b0d3..04911f8a20 100644
--- a/backends/platform/sdl/module.mk
+++ b/backends/platform/sdl/module.mk
@@ -34,7 +34,7 @@ MODULE_OBJS += \
 	ps3/ps3.o
 endif
 
-ifdef RASPBERRYPI
+ifdef DISPMANX
 MODULE_OBJS += \
 	raspberrypi/raspberrypi-main.o \
 	raspberrypi/raspberrypi.o
diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp
index 0785f36df7..492da70eeb 100644
--- a/backends/platform/sdl/posix/posix-main.cpp
+++ b/backends/platform/sdl/posix/posix-main.cpp
@@ -22,7 +22,7 @@
 
 #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/plugins/sdl/sdl-provider.h"
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 */
diff --git a/configure b/configure
index b6e21049de..11c4f1c070 100755
--- a/configure
+++ b/configure
@@ -4081,6 +4081,7 @@ define_in_config_if_yes "$_opengl" "USE_OPENGL"
 define_in_config_if_yes "$_opengles" "USE_GLES"
 
 # 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
 		echocheck "DispmanX graphics"
 		_use_dispmanx=no
@@ -4101,8 +4102,8 @@ EOF
 		if test "$_use_dispmanx" = "yes"; then
 			CXXFLAGS="$CXXFLAGS $DISPMANX_CXXFLAGS"
 			LIBS="$LIBS $DISPMANX_LIBS"
-			DEFINES="$DEFINES -DRASPBERRYPI"
-			add_line_to_config_mk 'RASPBERRYPI = 1'
+			DEFINES="$DEFINES -DDISPMANX"
+			add_line_to_config_mk 'DISPMANX = 1'
 			echo $_use_dispmanx
 		else echo "no"
 		fi