diff options
41 files changed, 37 insertions, 60 deletions
diff --git a/Makefile.common b/Makefile.common index c86aadfb59..232002dfe3 100644 --- a/Makefile.common +++ b/Makefile.common @@ -40,8 +40,8 @@ MODULES += \ gui \ graphics \ sound \ - backends \ - common + common \ + backends ifdef USE_MT32EMU MODULES += sound/softsynth/mt32 diff --git a/backends/dc/selector.cpp b/backends/dc/selector.cpp index 2932e36065..5aa5829da8 100644 --- a/backends/dc/selector.cpp +++ b/backends/dc/selector.cpp @@ -25,7 +25,7 @@ #include <common/scummsys.h> #include <base/engine.h> #include <base/plugins.h> -#include <backends/fs/fs.h> +#include <common/fs.h> #include "dc.h" #include "icon.h" #include "label.h" diff --git a/backends/fs/abstract-fs.h b/backends/fs/abstract-fs.h index fb4f83216b..9b3e473103 100644 --- a/backends/fs/abstract-fs.h +++ b/backends/fs/abstract-fs.h @@ -25,7 +25,7 @@ #include "common/array.h" #include "common/str.h" -#include "backends/fs/fs.h" +#include "common/fs.h" class AbstractFilesystemNode; diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index e4eca97713..d87e7d6497 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -38,7 +38,6 @@ #include "base/engine.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" #define ENTER() /* debug(6, "Enter") */ #define LEAVE() /* debug(6, "Leave") */ diff --git a/backends/fs/dc/dc-fs.cpp b/backends/fs/dc/dc-fs.cpp index 7a3289e971..479beb538f 100644 --- a/backends/fs/dc/dc-fs.cpp +++ b/backends/fs/dc/dc-fs.cpp @@ -24,7 +24,6 @@ #include "common/stdafx.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" #include <ronin/cdfs.h> #include <stdio.h> diff --git a/backends/fs/gp32/gp32-fs.cpp b/backends/fs/gp32/gp32-fs.cpp index 41900f71f6..9e59a8ccdd 100644 --- a/backends/fs/gp32/gp32-fs.cpp +++ b/backends/fs/gp32/gp32-fs.cpp @@ -26,7 +26,6 @@ #include "stdafx.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" class GP32FilesystemNode : public AbstractFilesystemNode { protected: diff --git a/backends/fs/morphos/abox-fs.cpp b/backends/fs/morphos/abox-fs.cpp index a51a683773..33a54b514e 100644 --- a/backends/fs/morphos/abox-fs.cpp +++ b/backends/fs/morphos/abox-fs.cpp @@ -27,7 +27,6 @@ #include "base/engine.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" /* * Implementation of the ScummVM file system API based on the MorphOS A-Box API. diff --git a/backends/fs/palmos/palmos-fs.cpp b/backends/fs/palmos/palmos-fs.cpp index e1effd0838..6163689e63 100644 --- a/backends/fs/palmos/palmos-fs.cpp +++ b/backends/fs/palmos/palmos-fs.cpp @@ -23,7 +23,6 @@ #include "common/stdafx.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" #include <stdio.h> #include <stdlib.h> diff --git a/backends/fs/posix/posix-fs.cpp b/backends/fs/posix/posix-fs.cpp index 3fa7711ccd..cd5d0209b8 100644 --- a/backends/fs/posix/posix-fs.cpp +++ b/backends/fs/posix/posix-fs.cpp @@ -24,7 +24,6 @@ #include "common/stdafx.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" #ifdef MACOSX #include <sys/types.h> diff --git a/backends/fs/ps2/ps2-fs.cpp b/backends/fs/ps2/ps2-fs.cpp index 9fe021f355..6c4e218c01 100644 --- a/backends/fs/ps2/ps2-fs.cpp +++ b/backends/fs/ps2/ps2-fs.cpp @@ -20,7 +20,6 @@ */ #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" #include <kernel.h> #include <stdio.h> #include <stdlib.h> diff --git a/backends/fs/psp/psp_fs.cpp b/backends/fs/psp/psp_fs.cpp index 893e4b7310..d0bf07f85a 100644 --- a/backends/fs/psp/psp_fs.cpp +++ b/backends/fs/psp/psp_fs.cpp @@ -26,7 +26,6 @@ #include "base/engine.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" #include <sys/stat.h> #include <unistd.h> diff --git a/backends/fs/symbian/symbian-fs.cpp b/backends/fs/symbian/symbian-fs.cpp index 6be8302f98..aa8e854125 100644 --- a/backends/fs/symbian/symbian-fs.cpp +++ b/backends/fs/symbian/symbian-fs.cpp @@ -25,7 +25,6 @@ #if defined (__SYMBIAN32__) #include "common/stdafx.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" #include <dirent.h> #include <eikenv.h> diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp index d37d2501d9..4c5cd44f49 100644 --- a/backends/fs/windows/windows-fs.cpp +++ b/backends/fs/windows/windows-fs.cpp @@ -23,7 +23,6 @@ #include "common/stdafx.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" #include <stdio.h> #include <stdlib.h> #include <windows.h> diff --git a/backends/module.mk b/backends/module.mk index 491c338c32..e59d76cb88 100644 --- a/backends/module.mk +++ b/backends/module.mk @@ -1,7 +1,6 @@ MODULE := backends MODULE_OBJS := \ - fs/fs.o \ fs/posix/posix-fs.o \ fs/morphos/abox-fs.o \ fs/windows/windows-fs.o \ diff --git a/backends/wince/CELauncherDialog.h b/backends/wince/CELauncherDialog.h index 7cb54a3f56..e2d85da8dc 100644 --- a/backends/wince/CELauncherDialog.h +++ b/backends/wince/CELauncherDialog.h @@ -23,10 +23,8 @@ #ifndef CELAUNCHERDIALOG #define CELAUNCHERDIALOG -#include "backends/fs/fs.h" - #include "base/plugins.h" - +#include "common/fs.h" #include "gui/launcher.h" class CELauncherDialog : public GUI::LauncherDialog { diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 64cb22ebd8..70f06031a7 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -51,7 +51,7 @@ #define DETECTOR_TESTING_HACK #ifdef DETECTOR_TESTING_HACK -#include "backends/fs/fs.h" +#include "common/fs.h" #endif namespace Base { diff --git a/base/main.cpp b/base/main.cpp index 94f5617f16..7c5042eb15 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -30,13 +30,13 @@ */ #include "common/stdafx.h" -#include "backends/fs/fs.h" #include "base/engine.h" #include "base/commandLine.h" #include "base/plugins.h" #include "base/version.h" #include "common/config-manager.h" #include "common/file.h" +#include "common/fs.h" #include "common/system.h" #include "common/timer.h" #include "gui/newgui.h" diff --git a/base/plugins.cpp b/base/plugins.cpp index a72cbf1384..d16ad791c8 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -22,10 +22,10 @@ */ #include "common/stdafx.h" -#include "backends/fs/fs.h" #include "base/plugins.h" #include "base/engine.h" #include "common/util.h" +#include "common/fs.h" /** Type of factory functions which make new Engine objects. */ typedef PluginError (*EngineFactory)(OSystem *syst, Engine **engine); diff --git a/common/file.cpp b/common/file.cpp index 075c821886..c71121b241 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -21,9 +21,9 @@ */ #include "common/file.h" +#include "common/fs.h" #include "common/hashmap.h" #include "common/util.h" -#include "backends/fs/fs.h" #ifdef MACOSX #include "CoreFoundation/CoreFoundation.h" diff --git a/backends/fs/fs.cpp b/common/fs.cpp index 2daa362196..3836dfc212 100644 --- a/backends/fs/fs.cpp +++ b/common/fs.cpp @@ -22,7 +22,6 @@ #include "common/stdafx.h" #include "backends/fs/abstract-fs.h" -#include "backends/fs/fs.h" #include "common/util.h" diff --git a/backends/fs/fs.h b/common/fs.h index 0e271b5fc9..a79d710024 100644 --- a/backends/fs/fs.h +++ b/common/fs.h @@ -19,12 +19,14 @@ * $Id$ */ -#ifndef BACKENDS_FS_H -#define BACKENDS_FS_H +#ifndef COMMON_FS_H +#define COMMON_FS_H #include "common/array.h" #include "common/str.h" +//namespace Common { + class FilesystemNode; class AbstractFilesystemNode; @@ -168,5 +170,6 @@ protected: void decRefCount(); }; +//} // End of namespace Common #endif diff --git a/common/module.mk b/common/module.mk index dc8048db64..9d1908f925 100644 --- a/common/module.mk +++ b/common/module.mk @@ -4,6 +4,7 @@ MODULE_OBJS := \ config-file.o \ config-manager.o \ file.o \ + fs.o \ hashmap.o \ md5.o \ mutex.o \ diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index d259e9ecc5..8225e5dcdb 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -24,13 +24,12 @@ #include "common/stdafx.h" #include "common/file.h" +#include "common/fs.h" #include "common/savefile.h" #include "common/config-manager.h" #include "base/plugins.h" -#include "backends/fs/fs.h" - #include "graphics/cursorman.h" #include "sound/mididrv.h" diff --git a/engines/agi/agi_v3.cpp b/engines/agi/agi_v3.cpp index c76524ef53..70ca92e868 100644 --- a/engines/agi/agi_v3.cpp +++ b/engines/agi/agi_v3.cpp @@ -27,9 +27,8 @@ #include "agi/agi.h" #include "agi/lzw.h" -#include "backends/fs/fs.h" - #include "common/config-manager.h" +#include "common/fs.h" namespace Agi { diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index 644caecb6e..2245afa227 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -24,14 +24,13 @@ #include "common/stdafx.h" #include "common/file.h" +#include "common/fs.h" #include "common/savefile.h" #include "common/config-manager.h" #include "common/system.h" #include "base/plugins.h" -#include "backends/fs/fs.h" - #include "graphics/cursorman.h" #include "sound/mididrv.h" diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index fb983a6749..1ed4d6a551 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -22,8 +22,8 @@ #include "common/stdafx.h" #include "base/plugins.h" -#include "backends/fs/fs.h" #include "common/config-manager.h" +#include "common/fs.h" #include "common/md5.h" #include "gob/gob.h" diff --git a/engines/kyra/plugin.cpp b/engines/kyra/plugin.cpp index 4acacf19d9..18b9c4f1dd 100644 --- a/engines/kyra/plugin.cpp +++ b/engines/kyra/plugin.cpp @@ -21,10 +21,9 @@ #include "kyra/kyra.h" -#include "backends/fs/fs.h" - #include "common/config-manager.h" #include "common/file.h" +#include "common/fs.h" #include "common/system.h" #include "common/md5.h" diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp index d60bf8b978..a80e4dff02 100644 --- a/engines/lure/lure.cpp +++ b/engines/lure/lure.cpp @@ -22,13 +22,12 @@ #include "common/stdafx.h" -#include "backends/fs/fs.h" - #include "base/plugins.h" #include "common/config-manager.h" #include "common/endian.h" #include "common/file.h" +#include "common/fs.h" #include "common/system.h" #include "common/md5.h" diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index b3380f3f97..2077fd1922 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -22,12 +22,11 @@ #include "common/stdafx.h" -#include "backends/fs/fs.h" - #include "base/plugins.h" #include "common/config-manager.h" #include "common/file.h" +#include "common/fs.h" #include "common/savefile.h" #include "common/system.h" diff --git a/engines/saga/game.cpp b/engines/saga/game.cpp index 7246be1b80..57ff94e575 100644 --- a/engines/saga/game.cpp +++ b/engines/saga/game.cpp @@ -27,11 +27,11 @@ #include "saga/saga.h" #include "common/file.h" +#include "common/fs.h" #include "common/md5.h" #include "common/hashmap.h" #include "common/config-manager.h" #include "base/plugins.h" -#include "backends/fs/fs.h" #include "saga/rscfile.h" #include "saga/interface.h" diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp index b980681220..0885fc77cf 100644 --- a/engines/scumm/plugin.cpp +++ b/engines/scumm/plugin.cpp @@ -23,11 +23,10 @@ #include "common/stdafx.h" -#include "backends/fs/fs.h" - #include "base/plugins.h" #include "common/config-manager.h" +#include "common/fs.h" #include "common/list.h" #include "common/md5.h" #include "common/system.h" // Only needed for g_system diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 32dcb5c946..45cd1c804f 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -23,9 +23,8 @@ #include "common/stdafx.h" -#include "backends/fs/fs.h" - #include "common/config-manager.h" +#include "common/fs.h" #include "common/md5.h" #include "common/system.h" diff --git a/engines/simon/game.cpp b/engines/simon/game.cpp index 33c483e7cb..48804d6495 100644 --- a/engines/simon/game.cpp +++ b/engines/simon/game.cpp @@ -23,12 +23,11 @@ #include "common/stdafx.h" -#include "backends/fs/fs.h" - #include "base/plugins.h" #include "common/config-manager.h" #include "common/file.h" +#include "common/fs.h" #include "common/md5.h" #include "simon/simon.h" diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 6d4e97fbc5..294edf7a21 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -23,10 +23,9 @@ #include "common/stdafx.h" -#include "backends/fs/fs.h" - #include "common/config-manager.h" #include "common/file.h" +#include "common/fs.h" #include "common/system.h" #include "gui/about.h" diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index 7c260445c5..9e589bf498 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -22,12 +22,11 @@ #include "common/stdafx.h" -#include "backends/fs/fs.h" - #include "base/plugins.h" #include "common/config-manager.h" #include "common/file.h" +#include "common/fs.h" #include "common/system.h" #include "common/timer.h" diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index 11053ad4e3..aa5ffafe2a 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -23,11 +23,10 @@ #include "common/stdafx.h" #include "sword1/sword1.h" -#include "backends/fs/fs.h" - #include "base/plugins.h" #include "common/config-manager.h" #include "common/file.h" +#include "common/fs.h" #include "common/timer.h" #include "common/system.h" diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index ad6bbfeaec..bbdc2c4092 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -21,12 +21,11 @@ #include "common/stdafx.h" -#include "backends/fs/fs.h" - #include "base/plugins.h" #include "common/config-manager.h" #include "common/file.h" +#include "common/fs.h" #include "common/system.h" #include "sword2/sword2.h" diff --git a/gui/browser.cpp b/gui/browser.cpp index 8bce35f0a8..59ab8ee5ae 100644 --- a/gui/browser.cpp +++ b/gui/browser.cpp @@ -24,9 +24,8 @@ #include "gui/newgui.h" #include "gui/ListWidget.h" -#include "backends/fs/fs.h" - #include "common/config-manager.h" +#include "common/fs.h" #include "common/system.h" #include "common/func.h" diff --git a/gui/browser.h b/gui/browser.h index bc6f676426..66400bfc07 100644 --- a/gui/browser.h +++ b/gui/browser.h @@ -24,7 +24,7 @@ #include "gui/dialog.h" #include "common/str.h" -#include "backends/fs/fs.h" +#include "common/fs.h" #ifdef MACOSX #include <Carbon/Carbon.h> diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 7f8af551ee..249752e984 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -21,14 +21,13 @@ #include "common/stdafx.h" -#include "backends/fs/fs.h" - #include "base/engine.h" #include "base/game.h" #include "base/plugins.h" #include "base/version.h" #include "common/config-manager.h" +#include "common/fs.h" #include "common/util.h" #include "common/system.h" diff --git a/gui/options.cpp b/gui/options.cpp index 79f2044589..fd16813c5f 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -28,10 +28,12 @@ #include "gui/PopUpWidget.h" #include "gui/TabWidget.h" -#include "backends/fs/fs.h" +#include "common/fs.h" #include "common/config-manager.h" -#include "graphics/scaler.h" #include "common/system.h" + +#include "graphics/scaler.h" + #include "sound/mididrv.h" #include "sound/mixer.h" |