update paths for recent move

2024-11-27 11:20:40 +00:00 · 2009-05-04 18:41:11 +00:00 · 2009-05-04 18:41:11 +00:00 · d3326c21eb
commit d3326c21eb
parent c62bf8df6d
55 changed files with 82 additions and 82 deletions
--- a/Makefile.common
+++ b/Makefile.common
@ -19,8 +19,8 @@ MODULES := tools $(MODULES)

 # After the game specific modules follow the shared modules
 MODULES += \
+	backends \
 	engine \
-	engine/backend \
 	engine/imuse \
 	engine/lua \
 	engine/smush \
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@ -25,8 +25,8 @@
 #if !defined(DISABLE_DEFAULT_EVENTMANAGER)

 #include "common/config-manager.h"
-#include "engine/backend/events/default/default-events.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/events/default/default-events.h"
+#include "backends/platform/driver.h"

 #define RECORD_SIGNATURE 0x54455354
 #define RECORD_VERSION 1
--- a/backends/fs/abstract-fs.cpp
+++ b/backends/fs/abstract-fs.cpp
@ -22,7 +22,7 @@
 * $Id$
 */

-#include "engine/backend/fs/abstract-fs.h"
+#include "backends/fs/abstract-fs.h"

 const char *AbstractFSNode::lastPathComponent(const Common::String &str, const char sep) {
 	// TODO: Get rid of this eventually! Use Common::lastPathComponent instead
--- a/backends/fs/amigaos4/amigaos4-fs-factory.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs-factory.cpp
@ -23,8 +23,8 @@
 */

 #if defined(__amigaos4__)
-#include "engine/backend/fs/amigaos4/amigaos4-fs-factory.h"
-#include "engine/backend/fs/amigaos4/amigaos4-fs.cpp"
+#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
+#include "backends/fs/amigaos4/amigaos4-fs.cpp"

 AbstractFSNode *AmigaOSFilesystemFactory::makeRootFileNode() const {
 	return new AmigaOSFilesystemNode();
--- a/backends/fs/amigaos4/amigaos4-fs-factory.h
+++ b/backends/fs/amigaos4/amigaos4-fs-factory.h
@ -25,7 +25,7 @@
 #ifndef AMIGAOS_FILESYSTEM_FACTORY_H
 #define AMIGAOS_FILESYSTEM_FACTORY_H

-#include "engine/backend/fs/fs-factory.h"
+#include "backends/fs/fs-factory.h"

 /**
 * Creates AmigaOSFilesystemNode objects.
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@ -37,8 +37,8 @@

 #include "common/debug.h"
 #include "common/util.h"
-#include "engine/backend/fs/abstract-fs.h"
-#include "engine/backend/fs/stdiostream.h"
+#include "backends/fs/abstract-fs.h"
+#include "backends/fs/stdiostream.h"

 #define ENTER() /* debug(6, "Enter") */
 #define LEAVE() /* debug(6, "Leave") */
--- a/backends/fs/fs-factory.h
+++ b/backends/fs/fs-factory.h
@ -26,7 +26,7 @@
 #define FILESYSTEM_FACTORY_H

 #include "common/str.h"
-#include "engine/backend/fs/abstract-fs.h"
+#include "backends/fs/abstract-fs.h"

 /**
 * Creates concrete FSNode objects depending on the current architecture.
--- a/backends/fs/posix/posix-fs-factory.cpp
+++ b/backends/fs/posix/posix-fs-factory.cpp
@ -23,8 +23,8 @@
 */

 #if defined(UNIX)
-#include "engine/backend/fs/posix/posix-fs-factory.h"
-#include "engine/backend/fs/posix/posix-fs.cpp"
+#include "backends/fs/posix/posix-fs-factory.h"
+#include "backends/fs/posix/posix-fs.cpp"

 AbstractFSNode *POSIXFilesystemFactory::makeRootFileNode() const {
 	return new POSIXFilesystemNode("/");
--- a/backends/fs/posix/posix-fs-factory.h
+++ b/backends/fs/posix/posix-fs-factory.h
@ -25,7 +25,7 @@
 #ifndef POSIX_FILESYSTEM_FACTORY_H
 #define POSIX_FILESYSTEM_FACTORY_H

-#include "engine/backend/fs/fs-factory.h"
+#include "backends/fs/fs-factory.h"

 /**
 * Creates POSIXFilesystemNode objects.
--- a/backends/fs/posix/posix-fs.cpp
+++ b/backends/fs/posix/posix-fs.cpp
@ -24,8 +24,8 @@

 #if defined(UNIX)

-#include "engine/backend/fs/posix/posix-fs.h"
-#include "engine/backend/fs/stdiostream.h"
+#include "backends/fs/posix/posix-fs.h"
+#include "backends/fs/stdiostream.h"
 #include "common/algorithm.h"

 #include <sys/param.h>
--- a/backends/fs/posix/posix-fs.h
+++ b/backends/fs/posix/posix-fs.h
@ -25,7 +25,7 @@
 #ifndef POSIX_FILESYSTEM_H
 #define POSIX_FILESYSTEM_H

-#include "engine/backend/fs/abstract-fs.h"
+#include "backends/fs/abstract-fs.h"

 #ifdef MACOSX
 #include <sys/types.h>
--- a/backends/fs/stdiostream.cpp
+++ b/backends/fs/stdiostream.cpp
@ -22,7 +22,7 @@
 * $Id$
 */

-#include "engine/backend/fs/stdiostream.h"
+#include "backends/fs/stdiostream.h"

 #include <errno.h>

@ -35,7 +35,7 @@
 	// for those replaced fopen/fread/etc functions
 	typedef unsigned long	uint64;
 	typedef signed long	int64;
-	#include "backends/platform/ps2/fileio.h"
+	#include "platforms/ps2/fileio.h"

 	#define fopen(a, b)			ps2_fopen(a, b)
 	#define fclose(a)			ps2_fclose(a)
--- a/backends/fs/windows/windows-fs-factory.cpp
+++ b/backends/fs/windows/windows-fs-factory.cpp
@ -23,8 +23,8 @@
 */

 #if defined(WIN32)
-#include "engine/backend/fs/windows/windows-fs-factory.h"
-#include "engine/backend/fs/windows/windows-fs.cpp"
+#include "backends/fs/windows/windows-fs-factory.h"
+#include "backends/fs/windows/windows-fs.cpp"

 AbstractFSNode *WindowsFilesystemFactory::makeRootFileNode() const {
 	return new WindowsFilesystemNode();
--- a/backends/fs/windows/windows-fs-factory.h
+++ b/backends/fs/windows/windows-fs-factory.h
@ -25,7 +25,7 @@
 #ifndef WINDOWS_FILESYSTEM_FACTORY_H
 #define WINDOWS_FILESYSTEM_FACTORY_H

-#include "engine/backend/fs/fs-factory.h"
+#include "backends/fs/fs-factory.h"

 /**
 * Creates WindowsFilesystemNode objects.
--- a/backends/fs/windows/windows-fs.cpp
+++ b/backends/fs/windows/windows-fs.cpp
@ -33,8 +33,8 @@
 #ifdef _WIN32_WCE
 #undef GetCurrentDirectory
 #endif
-#include "engine/backend/fs/abstract-fs.h"
-#include "engine/backend/fs/stdiostream.h"
+#include "backends/fs/abstract-fs.h"
+#include "backends/fs/stdiostream.h"
 #include <io.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/backends/module.mk
+++ b/backends/module.mk
@ -1,4 +1,4 @@
-MODULE := engine/backend
+MODULE := backends

 MODULE_OBJS := \
 	events/default/default-events.o \
--- a/backends/platform/driver.h
+++ b/backends/platform/driver.h
@ -39,7 +39,7 @@
 #include "engine/font.h"
 #include "engine/primitives.h"
 #include "engine/actor.h"
-#include "engine/backend/timer/default/default-timer.h"
+#include "backends/timer/default/default-timer.h"

 class Material;
 class Bitmap;
--- a/backends/platform/sdl/driver_gl.cpp
+++ b/backends/platform/sdl/driver_gl.cpp
@ -29,7 +29,7 @@
 #include "engine/colormap.h"
 #include "engine/material.h"

-#include "engine/backend/platform/sdl/driver_gl.h"
+#include "backends/platform/sdl/driver_gl.h"

 DriverGL::DriverGL() {
 	_storedDisplay = NULL;
--- a/backends/platform/sdl/driver_gl.h
+++ b/backends/platform/sdl/driver_gl.h
@ -34,8 +34,8 @@
 #include "engine/bitmap.h"
 #include "engine/vector3d.h"

-#include "engine/backend/platform/driver.h"
-#include "engine/backend/platform/sdl/driver_sdl.h"
+#include "backends/platform/driver.h"
+#include "backends/platform/sdl/driver_sdl.h"

 #include <SDL.h>
 #include <SDL_opengl.h>
--- a/backends/platform/sdl/driver_sdl.cpp
+++ b/backends/platform/sdl/driver_sdl.cpp
@ -29,19 +29,19 @@
 #include "common/events.h"
 #include "common/util.h"

-#include "engine/backend/platform/sdl/driver_sdl.h"
+#include "backends/platform/sdl/driver_sdl.h"

 #ifdef UNIX
-	#include "engine/backend/saves/posix/posix-saves.h"
+	#include "backends/saves/posix/posix-saves.h"
 #else
-	#include "engine/backend/saves/default/default-saves.h"
+	#include "backends/saves/default/default-saves.h"
 #endif
-#include "engine/backend/timer/default/default-timer.h"
+#include "backends/timer/default/default-timer.h"
 #include "mixer/mixer_intern.h"

-#include "engine/backend/timer/default/default-timer.h"
-#include "engine/backend/saves/default/default-saves.h"
-#include "engine/backend/events/default/default-events.h"
+#include "backends/timer/default/default-timer.h"
+#include "backends/saves/default/default-saves.h"
+#include "backends/events/default/default-events.h"

 #ifdef _WIN32
 #include <windows.h>
@ -55,11 +55,11 @@
 * Include header files needed for the getFilesystemFactory() method.
 */
 #if defined(__amigaos4__)
-	#include "engine/backend/fs/amigaos4/amigaos4-fs-factory.h"
+	#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
 #elif defined(UNIX)
-	#include "engine/backend/fs/posix/posix-fs-factory.h"
+	#include "backends/fs/posix/posix-fs-factory.h"
 #elif defined(WIN32)
-	#include "engine/backend/fs/windows/windows-fs-factory.h"
+	#include "backends/fs/windows/windows-fs-factory.h"
 #endif


--- a/backends/platform/sdl/driver_sdl.h
+++ b/backends/platform/sdl/driver_sdl.h
@ -33,8 +33,8 @@
 #include "engine/colormap.h"
 #include "engine/bitmap.h"
 #include "engine/vector3d.h"
-#include "engine/backend/platform/driver.h"
-#include "engine/backend/events/default/default-events.h"
+#include "backends/platform/driver.h"
+#include "backends/events/default/default-events.h"

 #include <SDL.h>

--- a/backends/platform/sdl/driver_tinygl.cpp
+++ b/backends/platform/sdl/driver_tinygl.cpp
@ -31,7 +31,7 @@
 #include "engine/material.h"
 #include "engine/font.h"
 #include "engine/vector3d.h"
-#include "engine/backend/platform/sdl/driver_tinygl.h"
+#include "backends/platform/sdl/driver_tinygl.h"

 #include "engine/tinygl/gl.h"
 #include "engine/tinygl/zgl.h"
--- a/backends/platform/sdl/driver_tinygl.h
+++ b/backends/platform/sdl/driver_tinygl.h
@ -33,8 +33,8 @@
 #include "engine/colormap.h"
 #include "engine/bitmap.h"
 #include "engine/vector3d.h"
-#include "engine/backend/platform/driver.h"
-#include "engine/backend/platform/sdl/driver_sdl.h"
+#include "backends/platform/driver.h"
+#include "backends/platform/sdl/driver_sdl.h"

 #include "engine/tinygl/gl.h"
 #include "engine/tinygl/zgl.h"
--- a/backends/platform/sdl/module.mk
+++ b/backends/platform/sdl/module.mk
@ -1,4 +1,4 @@
-MODULE := engine/backend/platform/sdl
+MODULE := backends/platform/sdl

 MODULE_OBJS := \
 	driver_gl.o \
@ -6,7 +6,7 @@ MODULE_OBJS := \
 	driver_tinygl.o

 MODULE_DIRS += \
-	engine/backend/platform/sdl/
+	backends/platform/sdl/

 # We don't use the rules.mk here on purpose
 OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
--- a/backends/saves/default/default-saves.cpp
+++ b/backends/saves/default/default-saves.cpp
@ -24,7 +24,7 @@

 #if !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)

-#include "engine/backend/saves/default/default-saves.h"
+#include "backends/saves/default/default-saves.h"

 #include "common/savefile.h"
 #include "common/util.h"
--- a/backends/saves/posix/posix-saves.cpp
+++ b/backends/saves/posix/posix-saves.cpp
@ -24,7 +24,7 @@

 #if defined(UNIX) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)

-#include "engine/backend/saves/posix/posix-saves.h"
+#include "backends/saves/posix/posix-saves.h"

 #include "common/config-manager.h"
 #include "common/savefile.h"
--- a/backends/saves/posix/posix-saves.h
+++ b/backends/saves/posix/posix-saves.h
@ -25,7 +25,7 @@
 #if !defined(BACKEND_POSIX_SAVES_H) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER)
 #define BACKEND_POSIX_SAVES_H

-#include "engine/backend/saves/default/default-saves.h"
+#include "backends/saves/default/default-saves.h"

 #if defined(UNIX)
 /**
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@ -23,9 +23,9 @@
 */

 #include "common/sys.h"
-#include "engine/backend/timer/default/default-timer.h"
+#include "backends/timer/default/default-timer.h"
 #include "common/util.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"


 struct TimerSlot {
--- a/common/archive.cpp
+++ b/common/archive.cpp
@ -27,7 +27,7 @@
 #include "common/fs.h"
 #include "common/util.h"

-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 namespace Common {

--- a/common/config-file.cpp
+++ b/common/config-file.cpp
@ -29,7 +29,7 @@
 #include "common/util.h"
 #include "common/debug.h"

-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #define MAXLINELEN 256

--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@ -34,7 +34,7 @@
 #include "common/fs.h"
 #include "common/util.h"

-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 DECLARE_SINGLETON(Common::ConfigManager);

--- a/common/debug.cpp
+++ b/common/debug.cpp
@ -27,13 +27,13 @@
 #include "common/debug.h"
 #include "common/str.h"

-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #ifdef __PLAYSTATION2__
 	// for those replaced fopen/fread/etc functions
 	typedef unsigned long	uint64;
 	typedef signed long	int64;
-	#include "engine/backend/platform/ps2/fileio.h"
+	#include "backends/platform/ps2/fileio.h"

 	#define fprintf				ps2_fprintf
 	#define fputs(str, file)	ps2_fputs(str, file)
@ -41,7 +41,7 @@
 #endif

 #ifdef __DS__
-	#include "engine/backend/fs/ds/ds-fs.h"
+	#include "backends/fs/ds/ds-fs.h"

 	void	std_fprintf(FILE* handle, const char* fmt, ...);
 	void	std_fflush(FILE* handle);
--- a/common/fs.cpp
+++ b/common/fs.cpp
@ -24,9 +24,9 @@
 */

 #include "common/util.h"
-#include "engine/backend/platform/driver.h"
-#include "engine/backend/fs/abstract-fs.h"
-#include "engine/backend/fs/fs-factory.h"
+#include "backends/platform/driver.h"
+#include "backends/fs/abstract-fs.h"
+#include "backends/fs/fs-factory.h"

 namespace Common {

--- a/common/mutex.cpp
+++ b/common/mutex.cpp
@ -26,7 +26,7 @@
 #include "common/mutex.h"
 #include "common/debug.h"

-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 namespace Common {

--- a/common/util.cpp
+++ b/common/util.cpp
@ -23,7 +23,7 @@
 */

 #include "common/util.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 namespace Common {

--- a/engine/actor.cpp
+++ b/engine/actor.cpp
@ -36,7 +36,7 @@
 #include "engine/walkplane.h"
 #include "engine/imuse/imuse.h"

-#include "backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #include <cmath>
 #include <cstring>
--- a/engine/bitmap.cpp
+++ b/engine/bitmap.cpp
@ -29,7 +29,7 @@

 #include "engine/bitmap.h"
 #include "engine/smush/smush.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #include <cstdlib>
 #include <cstring>
--- a/engine/cmd_line.cpp
+++ b/engine/cmd_line.cpp
@ -29,7 +29,7 @@

 #include "engine/cmd_line.h"
 #include "engine/version.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #define DETECTOR_TESTING_HACK

--- a/engine/engine.cpp
+++ b/engine/engine.cpp
@ -34,7 +34,7 @@
 #include "engine/actor.h"
 #include "engine/textobject.h"
 #include "engine/smush/smush.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"
 #include "engine/savegame.h"
 #include "engine/lipsync.h"
 #include "engine/registry.h"
--- a/engine/font.cpp
+++ b/engine/font.cpp
@ -28,7 +28,7 @@
 #include "common/debug.h"

 #include "engine/font.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #include <cstring>

--- a/engine/imuse/imuse_script.cpp
+++ b/engine/imuse/imuse_script.cpp
@ -28,7 +28,7 @@
 #include "common/timer.h"
 #include "common/mutex.h"

-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"
--- a/engine/imuse/imuse_track.cpp
+++ b/engine/imuse/imuse_track.cpp
@ -27,7 +27,7 @@
 #include "common/debug.h"
 #include "common/mutex.h"

-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #include "mixer/mixer.h"
 #include "mixer/audiostream.h"
--- a/engine/lua/liolib.cpp
+++ b/engine/lua/liolib.cpp
@ -17,7 +17,7 @@
 #include "engine/cmd_line.h"
 #include "engine/engine.h"
 #include "engine/savegame.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #if defined(UNIX) || defined(__SYMBIAN32__)
 #include <sys/stat.h>
--- a/engine/main.cpp
+++ b/engine/main.cpp
@ -37,8 +37,8 @@
 #include "engine/cmd_line.h"
 #include "engine/smush/smush.h"

-#include "engine/backend/platform/sdl/driver_gl.h"
-#include "engine/backend/platform/sdl/driver_tinygl.h"
+#include "backends/platform/sdl/driver_gl.h"
+#include "backends/platform/sdl/driver_tinygl.h"

 #include "mixer/mixer.h"

--- a/engine/material.cpp
+++ b/engine/material.cpp
@ -29,7 +29,7 @@

 #include "engine/material.h"
 #include "engine/colormap.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 Material::Material(const char *filename, const char *data, int len, const CMap &cmap) :
 		Resource(filename), _cmap((CMap *) &cmap) {
--- a/engine/model.cpp
+++ b/engine/model.cpp
@ -31,7 +31,7 @@
 #include "engine/resource.h"
 #include "engine/material.h"
 #include "engine/textsplit.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #include <cstring>
 #include <cstdio>
--- a/engine/primitives.cpp
+++ b/engine/primitives.cpp
@ -28,7 +28,7 @@

 #include "engine/font.h"
 #include "engine/color.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"
 #include "engine/primitives.h"

 #include <string>
--- a/engine/primitives.h
+++ b/engine/primitives.h
@ -31,7 +31,7 @@

 #include "engine/font.h"
 #include "engine/color.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #include <string>

--- a/engine/savegame.cpp
+++ b/engine/savegame.cpp
@ -28,7 +28,7 @@
 #include "common/endian.h"

 #include "engine/savegame.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #define SAVEGAME_HEADERTAG	'RSAV'
 #define SAVEGAME_FOOTERTAG	'ESAV'
--- a/engine/scene.cpp
+++ b/engine/scene.cpp
@ -31,7 +31,7 @@
 #include "engine/resource.h"
 #include "engine/bitmap.h"
 #include "engine/colormap.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"
 #include "engine/engine.h"
 #include "engine/vector3d.h"

--- a/engine/smush/smush.cpp
+++ b/engine/smush/smush.cpp
@ -32,7 +32,7 @@
 #include "engine/smush/smush.h"
 #include "engine/resource.h"
 #include "engine/engine.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"
 #include "engine/imuse/imuse_track.h"

 #include "mixer/mixer.h"
--- a/engine/textobject.cpp
+++ b/engine/textobject.cpp
@ -29,7 +29,7 @@
 #include "engine/textobject.h"
 #include "engine/engine.h"
 #include "engine/localize.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 std::string parseMsgText(const char *msg, char *msgId);

--- a/engine/textobject.h
+++ b/engine/textobject.h
@ -30,7 +30,7 @@

 #include "engine/font.h"
 #include "engine/color.h"
-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"

 #include <string>

--- a/mixer/mixer.cpp
+++ b/mixer/mixer.cpp
@ -30,7 +30,7 @@
 #include "mixer/rate.h"
 #include "mixer/audiostream.h"

-#include "engine/backend/platform/driver.h"
+#include "backends/platform/driver.h"


 namespace Audio {
--- a/tools/delua.cpp
+++ b/tools/delua.cpp
@ -45,7 +45,7 @@

 #include <engine/localize.h>
 #include <engine/resource.h>
-#include <engine/backend/platform/driver.h>
+#include <backends/platform/driver.h>

 // hacks below for shutup linker
 int g_flags = 0;