Don't #include the FS factory implementations in common/system.cpp; rather, rely on the build system to include them

svn-id: r30957

13 files changed, 44 insertions, 11 deletions

diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.cpp b/backends/fs/amigaos4/amigaos4-fs-factory.cpp
index 7307deb4bf..af843b7c78 100644
--- a/backends/fs/amigaos4/amigaos4-fs-factory.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode()
 AbstractFilesystemNode *AmigaOSFilesystemFactory::makeFileNodePath(const String &path) const {
 	return new AmigaOSFilesystemNode(path);
 }
+#endif
diff --git a/backends/fs/dc/ronincd-fs-factory.cpp b/backends/fs/dc/ronincd-fs-factory.cpp
index f72906c2aa..12ec1ffd68 100644
--- a/backends/fs/dc/ronincd-fs-factory.cpp
+++ b/backends/fs/dc/ronincd-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode()
 AbstractFilesystemNode *RoninCDFilesystemFactory::makeFileNodePath(const String &path) const {
 	return new RoninCDFilesystemNode(path, true);
 }
+#endif
diff --git a/backends/fs/ds/ds-fs-factory.cpp b/backends/fs/ds/ds-fs-factory.cpp
index 9edc46e60e..2eae2f2403 100644
--- a/backends/fs/ds/ds-fs-factory.cpp
+++ b/backends/fs/ds/ds-fs-factory.cpp
@@ -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 @@ AbstractFilesystemNode *DSFilesystemFactory::makeFileNodePath(const String &path
 		return new DS::DSFileSystemNode(path);
 	}
 }
+#endif
diff --git a/backends/fs/gp32/gp32-fs-factory.cpp b/backends/fs/gp32/gp32-fs-factory.cpp
index 62cdaedf45..150c4f3236 100644
--- a/backends/fs/gp32/gp32-fs-factory.cpp
+++ b/backends/fs/gp32/gp32-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode() co
 AbstractFilesystemNode *GP32FilesystemFactory::makeFileNodePath(const String &path) const {
 	return new GP32FilesystemNode(path);
 }
+#endif
diff --git a/backends/fs/morphos/abox-fs-factory.cpp b/backends/fs/morphos/abox-fs-factory.cpp
index e182513002..be96deb61b 100644
--- a/backends/fs/morphos/abox-fs-factory.cpp
+++ b/backends/fs/morphos/abox-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode() co
 AbstractFilesystemNode *ABoxFilesystemFactory::makeFileNodePath(const String &path) const {
 	return new ABoxFilesystemNode(path);
 }
+#endif
diff --git a/backends/fs/palmos/palmos-fs-factory.cpp b/backends/fs/palmos/palmos-fs-factory.cpp
index 9f24bcd596..8699a9788b 100644
--- a/backends/fs/palmos/palmos-fs-factory.cpp
+++ b/backends/fs/palmos/palmos-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode()
 AbstractFilesystemNode *PalmOSFilesystemFactory::makeFileNodePath(const String &path) const {
 	return new PalmOSFilesystemNode(path);
 }
+#endif
diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp
index 13212fb51f..0a1160ff8f 100644
--- a/backends/fs/posix/posix-fs-factory.cpp
+++ b/backends/fs/posix/posix-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode() c
 AbstractFilesystemNode *POSIXFilesystemFactory::makeFileNodePath(const String &path) const {
 	return new POSIXFilesystemNode(path, true);
 }
+#endif
diff --git a/backends/fs/ps2/ps2-fs-factory.cpp b/backends/fs/ps2/ps2-fs-factory.cpp
index 570fbd008c..7585e4f20a 100644
--- a/backends/fs/ps2/ps2-fs-factory.cpp
+++ b/backends/fs/ps2/ps2-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode() con
 AbstractFilesystemNode *Ps2FilesystemFactory::makeFileNodePath(const String &path) const {
 	return new Ps2FilesystemNode(path);
 }
+#endif
diff --git a/backends/fs/psp/psp-fs-factory.cpp b/backends/fs/psp/psp-fs-factory.cpp
index c0d7cb9e6f..87f0e0f587 100644
--- a/backends/fs/psp/psp-fs-factory.cpp
+++ b/backends/fs/psp/psp-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode() con
 AbstractFilesystemNode *PSPFilesystemFactory::makeFileNodePath(const String &path) const {
 	return new PSPFilesystemNode(path, true);
 }
+#endif
diff --git a/backends/fs/symbian/symbian-fs-factory.cpp b/backends/fs/symbian/symbian-fs-factory.cpp
index 195402e0bb..0a1bd62134 100644
--- a/backends/fs/symbian/symbian-fs-factory.cpp
+++ b/backends/fs/symbian/symbian-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode()
 AbstractFilesystemNode *SymbianFilesystemFactory::makeFileNodePath(const String &path) const {
 	return new SymbianFilesystemNode(path);
 }
+#endif
diff --git a/backends/fs/windows/windows-fs-factory.cpp b/backends/fs/windows/windows-fs-factory.cpp
index 4a4ef018fb..7fbf4f7fff 100644
--- a/backends/fs/windows/windows-fs-factory.cpp
+++ b/backends/fs/windows/windows-fs-factory.cpp
@@ -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::makeCurrentDirectoryFileNode()
 AbstractFilesystemNode *WindowsFilesystemFactory::makeFileNodePath(const String &path) const {
 	return new WindowsFilesystemNode(path, false);
 }
+#endif
diff --git a/backends/module.mk b/backends/module.mk
index 1a43cf5f7a..46154d9380 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -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 \
diff --git a/common/system.cpp b/common/system.cpp
index 6320bdf4e5..a4bfe1968e 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -137,27 +137,27 @@ void OSystem::getTimeAndDate(struct tm &t) const {
  * 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() {