diff --git a/Makefile.common b/Makefile.common index 927bffb5d60..9ef5a579601 100644 --- 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 \ diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 67ee818cc3e..82c1a15504f 100644 --- 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 diff --git a/backends/fs/abstract-fs.cpp b/backends/fs/abstract-fs.cpp index c594e68e66a..4e674fcb16a 100644 --- 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 diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.cpp b/backends/fs/amigaos4/amigaos4-fs-factory.cpp index e8e30ae4281..d70da50747f 100644 --- 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(); diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.h b/backends/fs/amigaos4/amigaos4-fs-factory.h index d64790df603..996a86f3b5f 100644 --- 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. diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index af9807ce1d5..5df8b33e2a7 100644 --- 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") */ diff --git a/backends/fs/fs-factory.h b/backends/fs/fs-factory.h index 42407e259de..9d4911e006f 100644 --- 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. diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp index 2d356f669c3..b2ca76ec07c 100644 --- 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("/"); diff --git a/backends/fs/posix/posix-fs-factory.h b/backends/fs/posix/posix-fs-factory.h index e43063b097d..9e27b98cb53 100644 --- 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. diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 681948efb9b..c0b2ca8051e 100644 --- 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 diff --git a/backends/fs/posix/posix-fs.h b/backends/fs/posix/posix-fs.h index 94e825d62f2..55cfbf73d9e 100644 --- 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 diff --git a/backends/fs/stdiostream.cpp b/backends/fs/stdiostream.cpp index 64d5d74246f..da5fe53a675 100644 --- 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 @@ -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) diff --git a/backends/fs/windows/windows-fs-factory.cpp b/backends/fs/windows/windows-fs-factory.cpp index 7229c37fe5e..feb8323b16b 100644 --- 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(); diff --git a/backends/fs/windows/windows-fs-factory.h b/backends/fs/windows/windows-fs-factory.h index 698a45c15b9..39aee40e91c 100644 --- 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. diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index eed2fc6cc0d..d908f2c12db 100644 --- 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 #include #include diff --git a/backends/module.mk b/backends/module.mk index 5b350e0a68e..956738f918a 100644 --- a/backends/module.mk +++ b/backends/module.mk @@ -1,4 +1,4 @@ -MODULE := engine/backend +MODULE := backends MODULE_OBJS := \ events/default/default-events.o \ diff --git a/backends/platform/driver.h b/backends/platform/driver.h index d4dda4395ff..537ccec9d2a 100644 --- 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; diff --git a/backends/platform/sdl/driver_gl.cpp b/backends/platform/sdl/driver_gl.cpp index 3e3ffbea0e0..0bd9f893388 100644 --- 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; diff --git a/backends/platform/sdl/driver_gl.h b/backends/platform/sdl/driver_gl.h index abd91009c84..26cc0c0e8b4 100644 --- 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 #include diff --git a/backends/platform/sdl/driver_sdl.cpp b/backends/platform/sdl/driver_sdl.cpp index 19fcc58c349..aa923545f7e 100644 --- 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 @@ -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 diff --git a/backends/platform/sdl/driver_sdl.h b/backends/platform/sdl/driver_sdl.h index edb69f65d97..ff577c2bdbc 100644 --- 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 diff --git a/backends/platform/sdl/driver_tinygl.cpp b/backends/platform/sdl/driver_tinygl.cpp index c4df675c7de..6cbd3f8f10e 100644 --- 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" diff --git a/backends/platform/sdl/driver_tinygl.h b/backends/platform/sdl/driver_tinygl.h index 7afa6ca0470..87d358d5dab 100644 --- 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" diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk index 674b9d77f3b..1e95f796fd1 100644 --- 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) diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp index 6b3ffe51bbc..243e8246fe8 100644 --- 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" diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp index b1d53363d8c..75fb15d69a5 100644 --- 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" diff --git a/backends/saves/posix/posix-saves.h b/backends/saves/posix/posix-saves.h index 49c95ae3514..bb0a55aec54 100644 --- 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) /** diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp index 981eba81a52..b41002b2d9d 100644 --- 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 { diff --git a/common/archive.cpp b/common/archive.cpp index 7b7c2fad8ae..90efae2785b 100644 --- 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 { diff --git a/common/config-file.cpp b/common/config-file.cpp index 76a006cd6e5..3268c6655af 100644 --- 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 diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 1729b22f9d2..b25c3bebee4 100644 --- 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); diff --git a/common/debug.cpp b/common/debug.cpp index dfc3b556bb3..b31d5c55e2a 100644 --- 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); diff --git a/common/fs.cpp b/common/fs.cpp index f6216a36028..6852f529525 100644 --- 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 { diff --git a/common/mutex.cpp b/common/mutex.cpp index e8dfeed87cf..9be7065eecc 100644 --- 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 { diff --git a/common/util.cpp b/common/util.cpp index 106e66f582e..53d8dc93ac0 100644 --- 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 { diff --git a/engine/actor.cpp b/engine/actor.cpp index 1a0c47a9141..aa2a299195b 100644 --- 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 #include diff --git a/engine/bitmap.cpp b/engine/bitmap.cpp index c6ed8e1f81e..d97fa6c985c 100644 --- 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 #include diff --git a/engine/cmd_line.cpp b/engine/cmd_line.cpp index e0e705fd18d..1c40950841e 100644 --- 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 diff --git a/engine/engine.cpp b/engine/engine.cpp index 86b0e1d9b50..1eefe0309d5 100644 --- 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" diff --git a/engine/font.cpp b/engine/font.cpp index f481195fe34..a407b198849 100644 --- 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 diff --git a/engine/imuse/imuse_script.cpp b/engine/imuse/imuse_script.cpp index 5fe8f739e91..a9f14d29055 100644 --- 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" diff --git a/engine/imuse/imuse_track.cpp b/engine/imuse/imuse_track.cpp index 9f2c6351665..74f4ee7fe67 100644 --- 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" diff --git a/engine/lua/liolib.cpp b/engine/lua/liolib.cpp index 0d415e206f2..3c99e979cb6 100644 --- 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 diff --git a/engine/main.cpp b/engine/main.cpp index 08d8d95804d..573089f8412 100644 --- 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" diff --git a/engine/material.cpp b/engine/material.cpp index f4e32d4ca6e..a8df4449f43 100644 --- 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) { diff --git a/engine/model.cpp b/engine/model.cpp index 7b7c7ed8af1..f6cda1ea194 100644 --- 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 #include diff --git a/engine/primitives.cpp b/engine/primitives.cpp index e3cf5db2e08..1ad29b28326 100644 --- 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 diff --git a/engine/primitives.h b/engine/primitives.h index b60e79c73c2..c24847f3696 100644 --- 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 diff --git a/engine/savegame.cpp b/engine/savegame.cpp index ca4cadf989f..9be2e6bb8a4 100644 --- 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' diff --git a/engine/scene.cpp b/engine/scene.cpp index 487fc68ad17..a7a7598892c 100644 --- 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" diff --git a/engine/smush/smush.cpp b/engine/smush/smush.cpp index 909bdcb208d..22b79a9707e 100644 --- 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" diff --git a/engine/textobject.cpp b/engine/textobject.cpp index b0a10b6a32f..cb45ea35706 100644 --- 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); diff --git a/engine/textobject.h b/engine/textobject.h index 3531bb0ce5b..0e5826913fe 100644 --- 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 diff --git a/mixer/mixer.cpp b/mixer/mixer.cpp index bd60efdaa57..8e7f012715c 100644 --- 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 { diff --git a/tools/delua.cpp b/tools/delua.cpp index e6e97da1804..982aa353ebb 100644 --- a/tools/delua.cpp +++ b/tools/delua.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include // hacks below for shutup linker int g_flags = 0;