* Updated Symbian project files for new file structure

svn-id: r23895

13 files changed, 47 insertions, 45 deletions

diff --git a/backends/platform/symbian/mmp/scummvm_agi.mmp.in b/backends/platform/symbian/mmp/scummvm_agi.mmp.in
index 8dcc52f05d..f6b47c3458 100644
--- a/backends/platform/symbian/mmp/scummvm_agi.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_agi.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\agi
+SOURCEPATH ..\..\..\..\engines\agi
 
 //START_AUTO_OBJECTS_AGI_//
 
@@ -49,7 +49,7 @@ SOURCEPATH ..\..\..\engines\agi
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in
index 3535621934..de0b8f2c53 100644
--- a/backends/platform/symbian/mmp/scummvm_base.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in
@@ -54,14 +54,14 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 	//MACRO			DISABLE_SWORD2		// LIB:scummvm_sword2.lib
 	//MACRO			DISABLE_LURE		// LIB:scummvm_lure.lib
 	//MACRO			DISABLE_CINE		// LIB:scummvm_cine.lib
-	//MACRO			DISABLE_AGI		// LIB:scummvm_cine.lib
+	//MACRO			DISABLE_AGI		// LIB:scummvm_agi.lib
 
 //STOP_AUTO_MACROS_MASTER//
 
 // *** Include paths
 
-USERINCLUDE	    ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound
-USERINCLUDE		..\..\..\backends\fs ..\src ..\..\..\backends\sdl
+USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -72,21 +72,21 @@ SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\common
+SOURCEPATH ..\..\..\..\common
 //START_AUTO_OBJECTS_COMMON_//
 
 	// empty base file, will be updated by Perl build scripts
 
 //STOP_AUTO_OBJECTS_COMMON_//
 
-SOURCEPATH ..\..\..\graphics
+SOURCEPATH ..\..\..\..\graphics
 //START_AUTO_OBJECTS_GRAPHICS_//
 
 	// empty base file, will be updated by Perl build scripts
 
 //STOP_AUTO_OBJECTS_GRAPHICS_//
 
-SOURCEPATH ..\..\..\gui
+SOURCEPATH ..\..\..\..\gui
 //START_AUTO_OBJECTS_GUI_//
 
 	// empty base file, will be updated by Perl build scripts
@@ -98,14 +98,16 @@ SOURCEPATH ..\..\..\gui
 //SOURCE KeysDialog.cpp
 //SOURCE Actions.cpp
 
-SOURCEPATH ..\..\..\sound
+SOURCEPATH ..\..\..\..\sound
 //START_AUTO_OBJECTS_SOUND_//
 
 	// empty base file, will be updated by Perl build scripts
 
 //STOP_AUTO_OBJECTS_SOUND_//
 
-sourcepath ..\..\..
+sourcepath ..\..\..\..
+source	   backends\timer\default\default-timer.cpp
+source	   backends\saves\savefile.cpp
+source	   backends\saves\default\default-saves.cpp
 // backend specific includes
-SOURCE backends\fs\fs.cpp
 // backend specific includes
diff --git a/backends/platform/symbian/mmp/scummvm_cine.mmp.in b/backends/platform/symbian/mmp/scummvm_cine.mmp.in
index 8385d93a5a..d8dcd62718 100644
--- a/backends/platform/symbian/mmp/scummvm_cine.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cine.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\cine
+SOURCEPATH ..\..\..\..\engines\cine
 
 //START_AUTO_OBJECTS_CINE_//
 
@@ -49,6 +49,6 @@ SOURCEPATH ..\..\..\engines\cine
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_gob.mmp.in b/backends/platform/symbian/mmp/scummvm_gob.mmp.in
index a99d900da0..34c4f82bd1 100644
--- a/backends/platform/symbian/mmp/scummvm_gob.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_gob.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\gob
+SOURCEPATH ..\..\..\..\engines\gob
 
 //START_AUTO_OBJECTS_GOB_//
 
@@ -49,6 +49,6 @@ SOURCEPATH ..\..\..\engines\gob
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_kyra.mmp.in b/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
index 60703336ca..899384003f 100644
--- a/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\kyra
+SOURCEPATH ..\..\..\..\engines\kyra
 
 //START_AUTO_OBJECTS_KYRA_//
 
@@ -49,6 +49,6 @@ SOURCEPATH ..\..\..\engines\kyra
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_lure.mmp.in b/backends/platform/symbian/mmp/scummvm_lure.mmp.in
index 55445358bb..1a52efbc69 100644
--- a/backends/platform/symbian/mmp/scummvm_lure.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_lure.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\lure
+SOURCEPATH ..\..\..\..\engines\lure
 
 //START_AUTO_OBJECTS_LURE_//
 
@@ -49,6 +49,6 @@ SOURCEPATH ..\..\..\engines\lure
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines 
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines 
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_queen.mmp.in b/backends/platform/symbian/mmp/scummvm_queen.mmp.in
index c1b3c03a45..b5a65b6cef 100644
--- a/backends/platform/symbian/mmp/scummvm_queen.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_queen.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\queen
+SOURCEPATH ..\..\..\..\engines\queen
 
 //START_AUTO_OBJECTS_QUEEN_//
 
@@ -49,6 +49,6 @@ SOURCEPATH ..\..\..\engines\queen
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_saga.mmp.in b/backends/platform/symbian/mmp/scummvm_saga.mmp.in
index 8ee0afd197..4f6555a049 100644
--- a/backends/platform/symbian/mmp/scummvm_saga.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_saga.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\saga
+SOURCEPATH ..\..\..\..\engines\saga
 
 //START_AUTO_OBJECTS_SAGA_//
 
@@ -49,6 +49,6 @@ SOURCEPATH ..\..\..\engines\saga
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
index fd9f6ccb6d..cdf454e663 100644
--- a/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\scumm
+SOURCEPATH ..\..\..\..\engines\scumm
 
 //START_AUTO_OBJECTS_SCUMM_//
 
@@ -61,8 +61,8 @@ SOURCEPATH ..\..\..\engines\scumm
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines ..\..\..\engines\scumm\smush ..\..\..\engines\scumm\insane
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
 SYSTEMINCLUDE   \epoc32\include\libc 
diff --git a/backends/platform/symbian/mmp/scummvm_simon.mmp.in b/backends/platform/symbian/mmp/scummvm_simon.mmp.in
index 4587392b20..af0def9867 100644
--- a/backends/platform/symbian/mmp/scummvm_simon.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_simon.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\simon
+SOURCEPATH ..\..\..\..\engines\simon
 
 //START_AUTO_OBJECTS_SIMON_//
 
@@ -49,7 +49,7 @@ SOURCEPATH ..\..\..\engines\simon
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_sky.mmp.in b/backends/platform/symbian/mmp/scummvm_sky.mmp.in
index 46097372a3..8748956564 100644
--- a/backends/platform/symbian/mmp/scummvm_sky.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sky.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\sky
+SOURCEPATH ..\..\..\..\engines\sky
 
 //START_AUTO_OBJECTS_SKY_//
 
@@ -49,6 +49,6 @@ SOURCEPATH ..\..\..\engines\sky
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines ..\..\..\engines\sky\music
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines ..\..\..\..\engines\sky\music
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_sword1.mmp.in b/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
index 3d6cf3f501..2bd6febc76 100644
--- a/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\sword1
+SOURCEPATH ..\..\..\..\engines\sword1
 
 //START_AUTO_OBJECTS_SWORD1_//
 
@@ -49,6 +49,6 @@ SOURCEPATH ..\..\..\engines\sword1
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src
diff --git a/backends/platform/symbian/mmp/scummvm_sword2.mmp.in b/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
index dbb0bce879..ddd299ce75 100644
--- a/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
@@ -39,7 +39,7 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\engines\sword2
+SOURCEPATH ..\..\..\..\engines\sword2
 
 //START_AUTO_OBJECTS_SWORD2_//
 
@@ -49,6 +49,6 @@ SOURCEPATH ..\..\..\engines\sword2
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\engines
-USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE     ..\..\..\..\engines
+USERINCLUDE     ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
 SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\src