BUILD: Add SDL_BACKEND=1 to config.mk for all SDL based backends

backends/graphics/opengl/gltexture.h

@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/scummsys.h"
+
 #ifdef WIN32
 #if defined(ARRAYSIZE) && !defined(_WINDOWS_)
 #undef ARRAYSIZE

backends/mixer/sdl/sdl-mixer.cpp

@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/scummsys.h"
+
 #if defined(SDL_BACKEND)
 
 #include "backends/mixer/sdl/sdl-mixer.h"

backends/module.mk

@@ -41,10 +41,7 @@ MODULE_OBJS := \
 # SDL specific source files.
 # We cannot just check $BACKEND = sdl, as various other backends
 # derive from the SDL backend, and they all need the following files.
-# TODO: Add SDL_BACKEND to config.mk; this would match the fact that
-# we also add -DSDL_BACKEND to the DEFINES.
-# However, the latter is only done for *most* SDL based stuff, not always
-# so we really should unify the relevant code in configure.
+ifdef SDL_BACKEND
 MODULE_OBJS += \
 	audiocd/sdl/sdl-audiocd.o \
 	events/sdl/sdl-events.o \
@@ -54,6 +51,7 @@ MODULE_OBJS += \
 	mutex/sdl/sdl-mutex.o \
 	plugins/sdl/sdl-provider.o \
 	timer/sdl/sdl-timer.o
+endif
 
 ifdef POSIX
 MODULE_OBJS += \

configure

@@ -2287,8 +2287,9 @@ case $_backend in
 	webos)
 		# There is no sdl-config in the WebOS PDK so we don't use find_sdlconfig here.
 		LIBS="$LIBS -lSDL"
-		DEFINES="$DEFINES -DSDL_BACKEND"
 		DEFINES="$DEFINES -DWEBOS"
+		DEFINES="$DEFINES -DSDL_BACKEND"
+		add_line_to_config_mk "SDL_BACKEND = 1"
 		MODULES="$MODULES backends/platform/sdl"
 		;;
 	wii)
@@ -2309,6 +2310,7 @@ case $_backend in
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/wince/CEkeys'
 		LIBS="$LIBS -static -lSDL"
 		DEFINES="$DEFINES -DSDL_BACKEND"
+		add_line_to_config_mk "SDL_BACKEND = 1"
 		;;
 	sdl)
 		;;
@@ -2328,6 +2330,7 @@ case $_backend in
 		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
 		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
 		DEFINES="$DEFINES -DSDL_BACKEND"
+		add_line_to_config_mk "SDL_BACKEND = 1"
 		;;
 esac