aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backends/platform/ps2/DmaPipe.h2
-rw-r--r--backends/platform/ps2/Gs2dScreen.h2
-rw-r--r--backends/platform/ps2/fileio.cpp4
-rw-r--r--backends/platform/ps2/icon.cpp6
-rw-r--r--backends/platform/ps2/irxboot.cpp2
-rw-r--r--backends/platform/ps2/ps2input.cpp10
-rw-r--r--backends/platform/ps2/ps2mutex.cpp2
-rw-r--r--backends/platform/ps2/ps2pad.cpp4
-rw-r--r--backends/platform/ps2/ps2time.cpp2
-rw-r--r--backends/platform/ps2/savefile.cpp6
-rw-r--r--backends/platform/ps2/systemps2.cpp16
-rw-r--r--backends/platform/symbian/src/ScummApp.cpp4
-rw-r--r--backends/platform/symbian/src/SymbianActions.cpp2
-rw-r--r--backends/platform/symbian/src/SymbianOS.cpp4
-rw-r--r--base/main.cpp2
-rw-r--r--common/config-manager.cpp2
-rw-r--r--common/scummsys.h2
-rw-r--r--gui/Actions.cpp6
18 files changed, 39 insertions, 39 deletions
diff --git a/backends/platform/ps2/DmaPipe.h b/backends/platform/ps2/DmaPipe.h
index 5cbef0d9ff..01ed03d968 100644
--- a/backends/platform/ps2/DmaPipe.h
+++ b/backends/platform/ps2/DmaPipe.h
@@ -26,7 +26,7 @@
#define __DMAPIPE_H__
#include "sysdefs.h"
-#include "backends/ps2/GsDefs.h"
+#include "backends/platform/ps2/GsDefs.h"
class SinglePipe;
diff --git a/backends/platform/ps2/Gs2dScreen.h b/backends/platform/ps2/Gs2dScreen.h
index 47438c632c..d74eed198b 100644
--- a/backends/platform/ps2/Gs2dScreen.h
+++ b/backends/platform/ps2/Gs2dScreen.h
@@ -24,7 +24,7 @@
#define __GS2DSCREEN_H__
#include "sysdefs.h"
-#include "backends/ps2/DmaPipe.h"
+#include "backends/platform/ps2/DmaPipe.h"
enum TVMode {
TV_DONT_CARE = 0,
diff --git a/backends/platform/ps2/fileio.cpp b/backends/platform/ps2/fileio.cpp
index 3b21e0796f..3c188cf439 100644
--- a/backends/platform/ps2/fileio.cpp
+++ b/backends/platform/ps2/fileio.cpp
@@ -20,14 +20,14 @@
*
*/
-#include "backends/ps2/fileio.h"
+#include "backends/platform/ps2/fileio.h"
#include <tamtypes.h>
#include <kernel.h>
#include <fileio.h>
#include <assert.h>
#include <string.h>
-#include "backends/ps2/asyncfio.h"
+#include "backends/platform/ps2/asyncfio.h"
#include "base/engine.h"
#include "common/file.h"
#include "eecodyvdfs.h"
diff --git a/backends/platform/ps2/icon.cpp b/backends/platform/ps2/icon.cpp
index db46ac5987..4569bc29c3 100644
--- a/backends/platform/ps2/icon.cpp
+++ b/backends/platform/ps2/icon.cpp
@@ -20,9 +20,9 @@
*
*/
-#include "backends/ps2/savefile.h"
-#include "backends/ps2/Gs2dScreen.h"
-#include "backends/ps2/GsDefs.h"
+#include "backends/platform/ps2/savefile.h"
+#include "backends/platform/ps2/Gs2dScreen.h"
+#include "backends/platform/ps2/GsDefs.h"
const iconIVECTOR Ps2SaveFileManager::_bgcolor[4] = {
{ 68, 23, 116, 0 }, // top left
diff --git a/backends/platform/ps2/irxboot.cpp b/backends/platform/ps2/irxboot.cpp
index fc844fc319..8872fb5f9f 100644
--- a/backends/platform/ps2/irxboot.cpp
+++ b/backends/platform/ps2/irxboot.cpp
@@ -27,7 +27,7 @@
#include <sifrpc.h>
#include <loadfile.h>
#include <malloc.h>
-#include "backends/ps2/irxboot.h"
+#include "backends/platform/ps2/irxboot.h"
extern void sioprintf(const char *zFormat, ...);
diff --git a/backends/platform/ps2/ps2input.cpp b/backends/platform/ps2/ps2input.cpp
index b3835ef648..bfca9f83be 100644
--- a/backends/platform/ps2/ps2input.cpp
+++ b/backends/platform/ps2/ps2input.cpp
@@ -24,11 +24,11 @@
#include <malloc.h>
#include <assert.h>
#include <libmouse.h>
-#include "backends/ps2/rpckbd.h"
-#include "backends/ps2/ps2input.h"
-#include "backends/ps2/ps2pad.h"
-#include "backends/ps2/systemps2.h"
-#include "backends/ps2/sdlkeys.h"
+#include "backends/platform/ps2/rpckbd.h"
+#include "backends/platform/ps2/ps2input.h"
+#include "backends/platform/ps2/ps2pad.h"
+#include "backends/platform/ps2/systemps2.h"
+#include "backends/platform/ps2/sdlkeys.h"
#include "common/system.h"
Ps2Input::Ps2Input(OSystem_PS2 *system, bool mouseLoaded, bool kbdLoaded) {
diff --git a/backends/platform/ps2/ps2mutex.cpp b/backends/platform/ps2/ps2mutex.cpp
index 6ae9a3a005..04b015b273 100644
--- a/backends/platform/ps2/ps2mutex.cpp
+++ b/backends/platform/ps2/ps2mutex.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "backends/ps2/systemps2.h"
+#include "backends/platform/ps2/systemps2.h"
OSystem::MutexRef OSystem_PS2::createMutex(void) {
WaitSema(_mutexSema);
diff --git a/backends/platform/ps2/ps2pad.cpp b/backends/platform/ps2/ps2pad.cpp
index 8394a421db..98341e9f95 100644
--- a/backends/platform/ps2/ps2pad.cpp
+++ b/backends/platform/ps2/ps2pad.cpp
@@ -23,8 +23,8 @@
#include <kernel.h>
#include <malloc.h>
#include <assert.h>
-#include "backends/ps2/systemps2.h"
-#include "backends/ps2/ps2pad.h"
+#include "backends/platform/ps2/systemps2.h"
+#include "backends/platform/ps2/ps2pad.h"
Ps2Pad::Ps2Pad(OSystem_PS2 *system) {
_system = system;
diff --git a/backends/platform/ps2/ps2time.cpp b/backends/platform/ps2/ps2time.cpp
index bfccfe1300..a8072492a0 100644
--- a/backends/platform/ps2/ps2time.cpp
+++ b/backends/platform/ps2/ps2time.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "backends/ps2/systemps2.h"
+#include "backends/platform/ps2/systemps2.h"
#include "eecodyvdfs.h"
#include <osd_config.h>
#define FROM_BCD(a) ((a >> 4) * 10 + (a & 0xF))
diff --git a/backends/platform/ps2/savefile.cpp b/backends/platform/ps2/savefile.cpp
index 495fc556b3..71073bd23f 100644
--- a/backends/platform/ps2/savefile.cpp
+++ b/backends/platform/ps2/savefile.cpp
@@ -28,9 +28,9 @@
#include <malloc.h>
#include <ucl/ucl.h>
#include <libmc.h>
-#include "backends/ps2/savefile.h"
-#include "backends/ps2/Gs2dScreen.h"
-#include "backends/ps2/systemps2.h"
+#include "backends/platform/ps2/savefile.h"
+#include "backends/platform/ps2/Gs2dScreen.h"
+#include "backends/platform/ps2/systemps2.h"
#include "common/scummsys.h"
extern void *_gp;
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index df16990032..6c53233649 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -34,21 +34,21 @@
#include "common/scummsys.h"
#include "../intern.h"
#include "base/engine.h"
-#include "backends/ps2/systemps2.h"
-#include "backends/ps2/Gs2dScreen.h"
-#include "backends/ps2/ps2input.h"
-#include "backends/ps2/irxboot.h"
+#include "backends/platform/ps2/systemps2.h"
+#include "backends/platform/ps2/Gs2dScreen.h"
+#include "backends/platform/ps2/ps2input.h"
+#include "backends/platform/ps2/irxboot.h"
#include <sjpcm.h>
#include <libhdd.h>
-#include "backends/ps2/savefile.h"
+#include "backends/platform/ps2/savefile.h"
#include "common/file.h"
-#include "backends/ps2/sysdefs.h"
+#include "backends/platform/ps2/sysdefs.h"
#include <libmc.h>
#include <libpad.h>
-#include "backends/ps2/cd.h"
+#include "backends/platform/ps2/cd.h"
#include <sio.h>
#include <fileXio_rpc.h>
-#include "backends/ps2/asyncfio.h"
+#include "backends/platform/ps2/asyncfio.h"
#include "eecodyvdfs.h"
#include "graphics/surface.h"
#include "graphics/font.h"
diff --git a/backends/platform/symbian/src/ScummApp.cpp b/backends/platform/symbian/src/ScummApp.cpp
index 4315c15065..9341b374f9 100644
--- a/backends/platform/symbian/src/ScummApp.cpp
+++ b/backends/platform/symbian/src/ScummApp.cpp
@@ -22,8 +22,8 @@
* $Id$
*/
-#include "backends/symbian/src/ScummApp.h"
-#include "backends/symbian/src/ScummVM.hrh"
+#include "backends/platform/symbian/src/ScummApp.h"
+#include "backends/platform/symbian/src/ScummVM.hrh"
#define _PAGESIZE_ 0x1000
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index ff85266af5..bed23d5321 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -21,7 +21,7 @@
*/
#include "common/stdafx.h"
-#include "backends/symbian/src/SymbianActions.h"
+#include "backends/platform/symbian/src/SymbianActions.h"
#include "gui/message.h"
#include "scumm/scumm.h"
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index b0b4486418..0b450a8e6f 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -22,8 +22,8 @@
* $Id$
*/
-#include "backends/symbian/src/SymbianOS.h"
-#include "backends/symbian/src/SymbianActions.h"
+#include "backends/platform/symbian/src/SymbianOS.h"
+#include "backends/platform/symbian/src/SymbianActions.h"
#include "common/config-manager.h"
#include "gui/Actions.h"
#include "gui/Key.h"
diff --git a/base/main.cpp b/base/main.cpp
index b0ef49c3a1..6b626ef389 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -46,7 +46,7 @@
#include "sound/mididrv.h"
#if defined(_WIN32_WCE)
-#include "backends/wince/CELauncherDialog.h"
+#include "backends/platform/wince/CELauncherDialog.h"
#elif defined(__DC__)
#include "backends/platform/dc/DCLauncherDialog.h"
#else
diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index 1f79c22c07..354a48e031 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -30,7 +30,7 @@
DECLARE_SINGLETON(Common::ConfigManager);
#ifdef __PLAYSTATION2__
-#include "backends/ps2/systemps2.h"
+#include "backends/platform/ps2/systemps2.h"
#endif
#if defined(UNIX)
diff --git a/common/scummsys.h b/common/scummsys.h
index c1bfc50528..898d902edb 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -441,7 +441,7 @@
// for those replaced fopen/fread/etc functions
typedef unsigned long uint64;
typedef signed long int64;
- #include "backends/ps2/fileio.h"
+ #include "backends/platform/ps2/fileio.h"
#endif
diff --git a/gui/Actions.cpp b/gui/Actions.cpp
index fac045a09e..53ebdfd720 100644
--- a/gui/Actions.cpp
+++ b/gui/Actions.cpp
@@ -27,10 +27,10 @@
#include "common/config-manager.h"
#ifdef _WIN32_WCE
- #include "backends/wince/CEActionsPocket.h"
- #include "backends/wince/CEActionsSmartphone.h"
+ #include "backends/platform/wince/CEActionsPocket.h"
+ #include "backends/platform/wince/CEActionsSmartphone.h"
#elif defined(__SYMBIAN32__)
- #include "backends/symbian/src/SymbianActions.h"
+ #include "backends/platform/symbian/src/SymbianActions.h"
#endif
namespace GUI {