[Scummvm-cvs-logs] SF.net SVN: scummvm: [30957] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Feb 25 00:14:06 CET 2008
Revision: 30957
http://scummvm.svn.sourceforge.net/scummvm/?rev=30957&view=rev
Author: fingolfin
Date: 2008-02-24 15:14:04 -0800 (Sun, 24 Feb 2008)
Log Message:
-----------
Don't #include the FS factory implementations in common/system.cpp; rather, rely on the build system to include them
Modified Paths:
--------------
scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.cpp
scummvm/trunk/backends/fs/dc/ronincd-fs-factory.cpp
scummvm/trunk/backends/fs/ds/ds-fs-factory.cpp
scummvm/trunk/backends/fs/gp32/gp32-fs-factory.cpp
scummvm/trunk/backends/fs/morphos/abox-fs-factory.cpp
scummvm/trunk/backends/fs/palmos/palmos-fs-factory.cpp
scummvm/trunk/backends/fs/posix/posix-fs-factory.cpp
scummvm/trunk/backends/fs/ps2/ps2-fs-factory.cpp
scummvm/trunk/backends/fs/psp/psp-fs-factory.cpp
scummvm/trunk/backends/fs/symbian/symbian-fs-factory.cpp
scummvm/trunk/backends/fs/windows/windows-fs-factory.cpp
scummvm/trunk/backends/module.mk
scummvm/trunk/common/system.cpp
Modified: scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(__amigaos4__)
#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
#include "backends/fs/amigaos4/amigaos4-fs.cpp"
@@ -38,3 +39,4 @@
AbstractFilesystemNode *AmigaOSFilesystemFactory::makeFileNodePath(const String &path) const {
return new AmigaOSFilesystemNode(path);
}
+#endif
Modified: scummvm/trunk/backends/fs/dc/ronincd-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/dc/ronincd-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/dc/ronincd-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(__DC__)
#include "backends/fs/dc/ronincd-fs-factory.h"
#include "backends/fs/dc/dc-fs.cpp"
@@ -38,3 +39,4 @@
AbstractFilesystemNode *RoninCDFilesystemFactory::makeFileNodePath(const String &path) const {
return new RoninCDFilesystemNode(path, true);
}
+#endif
Modified: scummvm/trunk/backends/fs/ds/ds-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/ds/ds-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(__DS__)
#include "backends/fs/ds/ds-fs-factory.h"
#include "backends/fs/ds/ds-fs.h"
#include "dsmain.h" //for the isGBAMPAvailable() function
@@ -51,3 +52,4 @@
return new DS::DSFileSystemNode(path);
}
}
+#endif
Modified: scummvm/trunk/backends/fs/gp32/gp32-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/gp32/gp32-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/gp32/gp32-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(__GP32__)
#include "backends/fs/gp32/gp32-fs-factory.h"
#include "backends/fs/gp32/gp32-fs.cpp"
@@ -38,3 +39,4 @@
AbstractFilesystemNode *GP32FilesystemFactory::makeFileNodePath(const String &path) const {
return new GP32FilesystemNode(path);
}
+#endif
Modified: scummvm/trunk/backends/fs/morphos/abox-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/morphos/abox-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/morphos/abox-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(__MORPHOS__)
#include "backends/fs/morphos/abox-fs-factory.h"
#include "backends/fs/morphos/abox-fs.cpp"
@@ -38,3 +39,4 @@
AbstractFilesystemNode *ABoxFilesystemFactory::makeFileNodePath(const String &path) const {
return new ABoxFilesystemNode(path);
}
+#endif
Modified: scummvm/trunk/backends/fs/palmos/palmos-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/palmos/palmos-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/palmos/palmos-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(PALMOS_MODE)
#include "backends/fs/palmos/palmos-fs-factory.h"
#include "backends/fs/palmos/palmos-fs.cpp"
@@ -38,3 +39,4 @@
AbstractFilesystemNode *PalmOSFilesystemFactory::makeFileNodePath(const String &path) const {
return new PalmOSFilesystemNode(path);
}
+#endif
Modified: scummvm/trunk/backends/fs/posix/posix-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/posix/posix-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/posix/posix-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(UNIX)
#include "backends/fs/posix/posix-fs-factory.h"
#include "backends/fs/posix/posix-fs.cpp"
@@ -40,3 +41,4 @@
AbstractFilesystemNode *POSIXFilesystemFactory::makeFileNodePath(const String &path) const {
return new POSIXFilesystemNode(path, true);
}
+#endif
Modified: scummvm/trunk/backends/fs/ps2/ps2-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/ps2/ps2-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/ps2/ps2-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(__PLAYSTATION2__)
#include "backends/fs/ps2/ps2-fs-factory.h"
#include "backends/fs/ps2/ps2-fs.cpp"
@@ -38,3 +39,4 @@
AbstractFilesystemNode *Ps2FilesystemFactory::makeFileNodePath(const String &path) const {
return new Ps2FilesystemNode(path);
}
+#endif
Modified: scummvm/trunk/backends/fs/psp/psp-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/psp/psp-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/psp/psp-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(__PSP__)
#include "backends/fs/psp/psp-fs-factory.h"
#include "backends/fs/psp/psp-fs.cpp"
@@ -38,3 +39,4 @@
AbstractFilesystemNode *PSPFilesystemFactory::makeFileNodePath(const String &path) const {
return new PSPFilesystemNode(path, true);
}
+#endif
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(__SYMBIAN32__)
#include "backends/fs/symbian/symbian-fs-factory.h"
#include "backends/fs/symbian/symbian-fs.cpp"
@@ -40,3 +41,4 @@
AbstractFilesystemNode *SymbianFilesystemFactory::makeFileNodePath(const String &path) const {
return new SymbianFilesystemNode(path);
}
+#endif
Modified: scummvm/trunk/backends/fs/windows/windows-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs-factory.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/fs/windows/windows-fs-factory.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -22,6 +22,7 @@
* $Id$
*/
+#if defined(WIN32)
#include "backends/fs/windows/windows-fs-factory.h"
#include "backends/fs/windows/windows-fs.cpp"
@@ -38,3 +39,4 @@
AbstractFilesystemNode *WindowsFilesystemFactory::makeFileNodePath(const String &path) const {
return new WindowsFilesystemNode(path, false);
}
+#endif
Modified: scummvm/trunk/backends/module.mk
===================================================================
--- scummvm/trunk/backends/module.mk 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/backends/module.mk 2008-02-24 23:14:04 UTC (rev 30957)
@@ -1,6 +1,17 @@
MODULE := backends
MODULE_OBJS := \
+ fs/amigaos4/amigaos4-fs-factory.o \
+ fs/dc/ronincd-fs-factory.o \
+ fs/ds/ds-fs-factory.o \
+ fs/gp32/gp32-fs-factory.o \
+ fs/morphos/abox-fs-factory.o \
+ fs/palmos/palmos-fs-factory.o \
+ fs/posix/posix-fs-factory.o \
+ fs/ps2/ps2-fs-factory.o \
+ fs/psp/psp-fs-factory.o \
+ fs/symbian/symbian-fs-factory.o \
+ fs/windows/windows-fs-factory.o \
events/default/default-events.o \
midi/alsa.o \
midi/camd.o \
Modified: scummvm/trunk/common/system.cpp
===================================================================
--- scummvm/trunk/common/system.cpp 2008-02-24 16:56:28 UTC (rev 30956)
+++ scummvm/trunk/common/system.cpp 2008-02-24 23:14:04 UTC (rev 30957)
@@ -137,27 +137,27 @@
* to the respective backends.
*/
#if defined(__amigaos4__)
- #include "backends/fs/amigaos4/amigaos4-fs-factory.cpp"
+ #include "backends/fs/amigaos4/amigaos4-fs-factory.h"
#elif defined(__DC__)
- #include "backends/fs/dc/ronincd-fs-factory.cpp"
+ #include "backends/fs/dc/ronincd-fs-factory.h"
#elif defined(__DS__)
- #include "backends/fs/ds/ds-fs-factory.cpp"
+ #include "backends/fs/ds/ds-fs-factory.h"
#elif defined(__GP32__)
- #include "backends/fs/gp32/gp32-fs-factory.cpp"
+ #include "backends/fs/gp32/gp32-fs-factory.h"
#elif defined(__MORPHOS__)
- #include "backends/fs/morphos/abox-fs-factory.cpp"
+ #include "backends/fs/morphos/abox-fs-factory.h"
#elif defined(PALMOS_MODE)
- #include "backends/fs/palmos/palmos-fs-factory.cpp"
+ #include "backends/fs/palmos/palmos-fs-factory.h"
#elif defined(__PLAYSTATION2__)
- #include "backends/fs/ps2/ps2-fs-factory.cpp"
+ #include "backends/fs/ps2/ps2-fs-factory.h"
#elif defined(__PSP__)
- #include "backends/fs/psp/psp-fs-factory.cpp"
+ #include "backends/fs/psp/psp-fs-factory.h"
#elif defined(__SYMBIAN32__)
- #include "backends/fs/symbian/symbian-fs-factory.cpp"
+ #include "backends/fs/symbian/symbian-fs-factory.h"
#elif defined(UNIX)
- #include "backends/fs/posix/posix-fs-factory.cpp"
+ #include "backends/fs/posix/posix-fs-factory.h"
#elif defined(WIN32)
- #include "backends/fs/windows/windows-fs-factory.cpp"
+ #include "backends/fs/windows/windows-fs-factory.h"
#endif
FilesystemFactory *OSystem::getFilesystemFactory() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list