Started to move 'monolithic' parts of our ports to the new 'background/platform' directory (see also the 'Modular_Backends' page in our Wiki)

svn-id: r23293

backends/platform/maemo/Makefile

@@ -60,7 +60,7 @@ MODULE_DIRS += .
 
 
 BACKEND := sdl
-MODULES +=  backends/sdl base
+MODULES +=  backends/platform/sdl base
 MODULE_DIRS += .
 
 HAVE_GCC3 = 1

backends/platform/maemo/maemo-sdl.h

@@ -24,7 +24,7 @@
 #define MAEMO_SDL_H
 
 #include "common/stdafx.h"
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 
 //#include "CEkeys.h"
 

backends/platform/null/module.mk

@@ -1,10 +1,10 @@
-MODULE := backends/null
+MODULE := backends/platform/null
 
 MODULE_OBJS := \
 	null.o
 
 MODULE_DIRS += \
-	backends/null/
+	backends/platform/null/
 
 # We don't use the rules.mk here on purpose
 OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)

backends/platform/sdl/events.cpp

@@ -21,7 +21,7 @@
  *
  */
 
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 #include "common/util.h"
 
 // FIXME move joystick defines out and replace with confile file options

backends/platform/sdl/graphics.cpp

@@ -21,7 +21,7 @@
  *
  */
 
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 #include "common/util.h"
 #include "graphics/font.h"
 #include "graphics/fontman.h"

backends/platform/sdl/module.mk

@@ -1,4 +1,4 @@
-MODULE := backends/sdl
+MODULE := backends/platform/sdl
 
 MODULE_OBJS := \
 	events.o \
@@ -6,7 +6,7 @@ MODULE_OBJS := \
 	sdl.o
 
 MODULE_DIRS += \
-	backends/sdl/
+	backends/platform/sdl/
 
 # We don't use the rules.mk here on purpose
 OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)

backends/platform/sdl/sdl.cpp

@@ -21,7 +21,7 @@
  *
  */
 
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 #include "common/config-manager.h"
 #include "common/util.h"
 #include "base/main.h"

backends/platform/x11/module.mk

@@ -1,10 +1,10 @@
-MODULE := backends/x11
+MODULE := backends/platform/x11
 
 MODULE_OBJS := \
 	x11.o
 
 MODULE_DIRS += \
-	backends/x11/
+	backends/platform/x11/
 
 # We don't use the rules.mk here on purpose
 OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)

backends/platform/x11/x11.cpp

@@ -29,6 +29,7 @@
 #include "common/util.h"
 #include "base/main.h"
 #include "backends/intern.h"
+#include "backends/platform/x11/x11.h"
 
 #include <stdio.h>
 #include <assert.h>
@@ -56,7 +57,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <backends/x11/x11.h>
 
 int main(int argc, char *argv[]) {
 	g_system = OSystem_X11::create(0, 0);

backends/symbian/src/SymbianOS.h

@@ -25,7 +25,7 @@
 #ifndef SDLSYMBIANH
 #define SDLSYMBIANH
 
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 
 /** Vibration support */
 #ifdef USE_VIBRA_SE_PXXX

backends/wince/wince-sdl.h

@@ -28,7 +28,7 @@
 #include "common/system.h"
 #include "graphics/scaler.h"
 #include "backends/intern.h"
-#include "backends/sdl/sdl-common.h"
+#include "backends/platform/sdl/sdl-common.h"
 
 #include "CEgui.h"
 #include "CEkeys.h"

configure

@@ -1327,20 +1327,20 @@ fi
 case $_backend in
 	null)
 		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
-		MODULES="$MODULES backends/null"
+		MODULES="$MODULES backends/platform/null"
 		;;
 	sdl)
 		find_sdlconfig
 		INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
 		LIBS="$LIBS `$_sdlconfig --libs`"
-		MODULES="$MODULES backends/sdl"
+		MODULES="$MODULES backends/platform/sdl"
 		;;
 	x11)
 		INCLUDES="$INCLUDES -I/usr/X11R6/include"
 		LIBS="$LIBS -lpthread -lXext -lX11"
 		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/local/lib"
 		DEFINES="$DEFINES -DX11_BACKEND"
-		MODULES="$MODULES backends/x11"
+		MODULES="$MODULES backends/platform/x11"
 		;;
 	*)
 		echo "support for $_backend backend not implemented in configure script yet"

dists/devcpp/scummvm.dev

@@ -20,7 +20,7 @@ ObjectOutput=scummvm
 OverrideOutput=0
 OverrideOutputName=scummvm.exe
 HostApplication=
-Folders=backends,backends/fs,backends/fs/windows,backends/midi,backends/sdl,base,common,graphics,graphics/fonts,graphics/scaler,gui,sound,sound/softsynth,sound/softsynth/mt32
+Folders=backends,backends/fs,backends/fs/windows,backends/midi,backends/platform/sdl,base,common,graphics,graphics/fonts,graphics/scaler,gui,sound,sound/softsynth,sound/softsynth/mt32
 CommandLine=
 UseCustomMakefile=0
 CustomMakefile=
@@ -30,9 +30,9 @@ CompilerSet=0
 CompilerSettings=0000000000000000000000
 
 [Unit4]
-FileName=..\..\backends\sdl\sdl.cpp
+FileName=..\..\backends\platform\sdl\sdl.cpp
 CompileCpp=1
-Folder=backends/sdl
+Folder=backends/platform/sdl
 Compile=1
 Link=1
 Priority=1000
@@ -40,9 +40,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit5]
-FileName=..\..\backends\sdl\sdl-common.h
+FileName=..\..\backends\platform\sdl\sdl-common.h
 CompileCpp=1
-Folder=backends/sdl
+Folder=backends/platform/sdl
 Compile=1
 Link=1
 Priority=1000
@@ -1938,9 +1938,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit2]
-FileName=..\..\backends\sdl\events.cpp
+FileName=..\..\backends\platform\sdl\events.cpp
 CompileCpp=1
-Folder=backends/sdl
+Folder=backends/platform/sdl
 Compile=1
 Link=1
 Priority=1000
@@ -1948,9 +1948,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit3]
-FileName=..\..\backends\sdl\graphics.cpp
+FileName=..\..\backends\platform\sdl\graphics.cpp
 CompileCpp=1
-Folder=backends/sdl
+Folder=backends/platform/sdl
 Compile=1
 Link=1
 Priority=1000