[Scummvm-cvs-logs] scummvm master -> 4d485fc7413544e51d7e00fd837e7b46b2e5962b

[salty-horse]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4d485fc741 BACKENDS: Fix compilation for various backends


Commit: 4d485fc7413544e51d7e00fd837e7b46b2e5962b
    https://github.com/scummvm/scummvm/commit/4d485fc7413544e51d7e00fd837e7b46b2e5962b
Author: Ori Avtalion (ori at avtalion.name)
Date: 2011-04-28T13:24:06-07:00

Commit Message:
BACKENDS: Fix compilation for various backends

Affects:
* PS2
* GPH
* ELF
* MOTO
* IPHONE
* N64
* DINGUX
* WINCE
* PSP

Changed paths:
    backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
    backends/graphics/gph/gph-graphics.cpp
    backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
    backends/platform/iphone/osys_main.h
    backends/platform/n64/osys_n64.h
    backends/platform/ps2/ps2input.h
    backends/platform/ps2/systemps2.h
    backends/platform/psp/mp3.cpp
    backends/platform/wince/wince-sdl.cpp
    backends/plugins/elf/memory-manager.cpp



diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
index 3c043ca..b50c3a7 100644
--- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
+++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
@@ -31,6 +31,7 @@
 #include "backends/events/dinguxsdl/dinguxsdl-events.h"
 #include "graphics/scaler/aspect.h"
 #include "common/mutex.h"
+#include "common/textconsole.h"
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{"1x", "Standard", GFX_NORMAL},
diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp
index 4f2185e..6d23777 100644
--- a/backends/graphics/gph/gph-graphics.cpp
+++ b/backends/graphics/gph/gph-graphics.cpp
@@ -28,6 +28,7 @@
 #include "backends/events/gph/gph-events.h"
 #include "graphics/scaler/aspect.h"
 #include "common/mutex.h"
+#include "common/textconsole.h"
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{"1x", "Standard", GFX_NORMAL},
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
index c2dcb7f..ebfd471 100644
--- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
+++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
@@ -30,6 +30,7 @@
 #include "backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h"
 #include "backends/events/linuxmotosdl/linuxmotosdl-events.h"
 #include "common/mutex.h"
+#include "common/textconsole.h"
 #include "graphics/font.h"
 #include "graphics/fontman.h"
 #include "graphics/scaler.h"
diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h
index 25c3c40..79f5966 100644
--- a/backends/platform/iphone/osys_main.h
+++ b/backends/platform/iphone/osys_main.h
@@ -30,6 +30,7 @@
 #include "audio/mixer_intern.h"
 #include "backends/fs/posix/posix-fs-factory.h"
 #include "graphics/colormasks.h"
+#include "graphics/palette.h"
 
 #include <AudioToolbox/AudioQueue.h>
 
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index 2daa41a..7a84de0 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -37,6 +37,7 @@
 
 #include "graphics/surface.h"
 #include "graphics/colormasks.h"
+#include "graphics/palette.h"
 #include "graphics/pixelformat.h"
 
 #include "audio/mixer_intern.h"
diff --git a/backends/platform/ps2/ps2input.h b/backends/platform/ps2/ps2input.h
index 266f408..eca5950 100644
--- a/backends/platform/ps2/ps2input.h
+++ b/backends/platform/ps2/ps2input.h
@@ -32,6 +32,10 @@
 class OSystem_PS2;
 class Ps2Pad;
 
+namespace Common {
+struct Event;
+}
+
 class Ps2Input {
 public:
 	Ps2Input(OSystem_PS2 *system, bool mouseLoaded, bool kbdLoaded);
diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index c13dcb0..54e6f05 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -28,6 +28,7 @@
 
 #include "common/system.h"
 #include "backends/base-backend.h"
+#include "graphics/palette.h"
 
 class DefaultTimerManager;
 class DefaultSaveFileManager;
diff --git a/backends/platform/psp/mp3.cpp b/backends/platform/psp/mp3.cpp
index 54476da..0faeacb 100644
--- a/backends/platform/psp/mp3.cpp
+++ b/backends/platform/psp/mp3.cpp
@@ -29,6 +29,7 @@
 #include "common/util.h"
 #include "common/singleton.h"
 #include "common/mutex.h"
+#include "common/textconsole.h"
 
 #include "audio/audiostream.h"
 
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index b829686..b54aebe 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -33,6 +33,7 @@
 #include "common/debug.h"
 #include "common/events.h"
 #include "common/util.h"
+#include "common/textconsole.h"
 #include "common/timer.h"
 #include "common/translation.h"
 
diff --git a/backends/plugins/elf/memory-manager.cpp b/backends/plugins/elf/memory-manager.cpp
index b2ac497..d32ac2d 100644
--- a/backends/plugins/elf/memory-manager.cpp
+++ b/backends/plugins/elf/memory-manager.cpp
@@ -28,6 +28,7 @@
 #if defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER)
 
 #include "backends/plugins/elf/memory-manager.h"
+#include "common/debug.h"
 #include "common/util.h"
 #include <malloc.h>