Remove Symbian FS creation from common SDL code

svn-id: r31364

6 files changed, 14 insertions, 10 deletions

diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index d5db665f21..866f5299a0 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -45,9 +45,6 @@
  */
 #if defined(__amigaos4__)
 	#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
-#elif defined(__SYMBIAN32__)
-	// TODO: Move this to the symbian source code
-	#include "backends/fs/symbian/symbian-fs-factory.h"
 #elif defined(UNIX)
 	#include "backends/fs/posix/posix-fs-factory.h"
 #elif defined(WIN32)
@@ -235,13 +232,13 @@ Common::SaveFileManager *OSystem_SDL::getSavefileManager() {
 
 FilesystemFactory *OSystem_SDL::getFilesystemFactory() {
 	#if defined(__amigaos4__)
-		return &AmigaOSFilesystemFactory::instance();
-	#elif defined(__SYMBIAN32__)
-		return &SymbianFilesystemFactory::instance();
+		return &AmigaOSFilesystemFactory::instance();	
 	#elif defined(UNIX)
 		return &POSIXFilesystemFactory::instance();
 	#elif defined(WIN32)
 		return &WindowsFilesystemFactory::instance();
+	#elif defined(__SYMBIAN32__)
+		// Do nothing since its handled by the Symbian SDL inheritance
 	#else
 		#error Unknown and unsupported backend in OSystem_SDL::getFilesystemFactory
 	#endif
diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index ae10a7ed72..5a3426a232 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -73,7 +73,8 @@ my @excludes_graphics = (
 
 my @excludes_scumm = (
 	"codec47ARM.cpp",
-	"gfxARM.cpp"
+	"gfxARM.cpp",
+	"proc3arm.cpp"
 );
 
 #arseModule(mmpStr,		dirStr,		ifdefArray,		[exclusionsArray])
diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
index 473dd5c243..ff11657b34 100644
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -115,7 +115,7 @@ SOURCEPATH ..\..\..\..
 SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
-SOURCE backends\fs\abstract-fs-factory.cpp
+SOURCE backends\fs\symbian\symbian-fs-factory.cpp
 SOURCE backends\platform\symbian\src\SymbianOS.cpp
 SOURCE backends\platform\symbian\src\SymbianActions.cpp
 SOURCE backends\platform\symbian\src\ScummApp.cpp
diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
index 77dd1b8434..a1ac965148 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
@@ -116,7 +116,7 @@ SOURCEPATH ..\..\..\..\
 SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
-SOURCE backends\fs\abstract-fs-factory.cpp
+SOURCE backends\fs\symbian\symbian-fs-factory.cpp
 SOURCE backends\platform\symbian\src\SymbianOS.cpp
 SOURCE backends\platform\symbian\src\SymbianActions.cpp
 SOURCE backends\platform\symbian\src\ScummApp.cpp
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 341f551716..3e34025eab 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -24,7 +24,8 @@
 
 #include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError()
 #include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath()
-
+	
+#include "backends/fs/symbian/symbian-fs-factory.h"
 #include "backends/platform/symbian/src/SymbianOS.h"
 #include "backends/platform/symbian/src/SymbianActions.h"
 #include "common/config-manager.h"
@@ -105,6 +106,10 @@ void OSystem_SDL_Symbian::setFeatureState(Feature f, bool enable) {
 	}
 }
 
+FilesystemFactory *OSystem_SDL_Symbian::getFilesystemFactory() {
+	return &SymbianFilesystemFactory::instance();
+}
+
 OSystem_SDL_Symbian::zoneDesc OSystem_SDL_Symbian::_zones[TOTAL_ZONES] = {
         { 0, 0, 320, 145 },
         { 0, 145, 150, 55 },
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 68f692915a..77e42cd476 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -75,6 +75,7 @@ protected:
 	//
 	void symbianMix(byte *samples, int len);
 
+	virtual FilesystemFactory *getFilesystemFactory();
 public:
 	// vibration support
 #ifdef USE_VIBRA_SE_PXXX