* Updated Symbian project files for new file structure

svn-id: r23895

28 files changed, 121 insertions, 109 deletions

diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index 48b100b2ee..3688bca578 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -2,7 +2,7 @@
 use Cwd;
 
 $buildDir = getcwd();
-chdir("../../");
+chdir("../../../");
 
 # list of project files to process
 @mmp_files = (
diff --git a/backends/platform/symbian/S60/ScummVM_S60.mmp.in b/backends/platform/symbian/S60/ScummVM_S60.mmp.in
index 3421cb306d..3fafe70fa2 100644
--- a/backends/platform/symbian/S60/ScummVM_S60.mmp.in
+++ b/backends/platform/symbian/S60/ScummVM_S60.mmp.in
@@ -60,8 +60,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi
 
 // *** Include paths
 
-USERINCLUDE	    ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE		..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -71,7 +71,7 @@ SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
 
 //START_AUTO_OBJECTS_BASE_//
 
@@ -82,13 +82,13 @@ SOURCEPATH ..\..\..\base
 SOURCEPATH ..\..\..
 
 // backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+SOURCE backends\platform\sdl\events.cpp
+SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\symbian\src\SymbianOS.cpp 
-SOURCE backends\symbian\src\SymbianActions.cpp 
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp 
+SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
diff --git a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
index d95ea72456..90206c5bf6 100644
--- a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
+++ b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
@@ -6,7 +6,7 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S60v1"},(0x101f9b57),0,80,0
+#{"ScummVM S60v1"},(0x101f9b57),0,90,0
 
 ; Platform type
 (0x101F6F88), 0, 0, 0, {"Series60ProductID"}
diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
index 545eade06e..b7dc9d06de 100644
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -64,7 +64,7 @@ END
 
 EPOCSTACKSIZE	0x0000F000
 EPOCHEAPSIZE	2048000	16192000
-
+ALWAYS_BUILD_AS_ARM
 MACRO			S60
 MACRO			S60V3
 MACRO			EPOC_AS_APP
@@ -80,8 +80,8 @@ STATICLIBRARY esdl.lib
 
 // *** Include paths
 
-USERINCLUDE	    ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE		..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -91,7 +91,7 @@ SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
 
 //START_AUTO_OBJECTS_BASE_//
 
@@ -102,13 +102,13 @@ SOURCEPATH ..\..\..\base
 SOURCEPATH ..\..\..
 
 // backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+SOURCE backends\platform\sdl\events.cpp
+SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\symbian\src\SymbianOS.cpp 
-SOURCE backends\symbian\src\SymbianActions.cpp 
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp 
+SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index d6a1e94c1f..ca1ac21246 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -16,6 +16,7 @@
 ;Supports Series 60 v 3.0
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
 
+*"..\res\scummvm.key","..\res\scummvm.cer",KEY="scummvm"
 ; Launcher, Application, AIF & Resource file
 "\s60v3\epoc32\release\gcce\urel\ScummVM.exe"-		"!:\sys\bin\ScummVM.exe"
 "\s60v3\epoc32\data\z\resource\apps\ScummVM.rsc"-	"!:\resource\apps\ScummVM.rsc"
diff --git a/backends/platform/symbian/S80/ScummVM_S80.mmp.in b/backends/platform/symbian/S80/ScummVM_S80.mmp.in
index 6074439552..3819ef8419 100644
--- a/backends/platform/symbian/S80/ScummVM_S80.mmp.in
+++ b/backends/platform/symbian/S80/ScummVM_S80.mmp.in
@@ -58,8 +58,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi
 
 // *** Include paths
 
-USERINCLUDE	    ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE		..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -69,7 +69,7 @@ SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
 
 //START_AUTO_OBJECTS_BASE_//
 
@@ -80,13 +80,13 @@ SOURCEPATH ..\..\..\base
 SOURCEPATH ..\..\..
 
 // backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+SOURCE backends\platform\sdl\events.cpp
+SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\symbian\src\SymbianOS.cpp 
-SOURCE backends\symbian\src\SymbianActions.cpp 
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp 
+SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
diff --git a/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg b/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
index e48d37b08e..bad357261c 100644
--- a/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
+++ b/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
@@ -6,7 +6,7 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S80"},(0x101f9b57),0,80,3
+#{"ScummVM S80"},(0x101f9b57),0,90,0
 
 ; Platform type -- disabled: seems to be causing trouble
 ;(0x101F8ED2), 0, 0, 0, {"Series80ProductID"}
diff --git a/backends/platform/symbian/S90/Scummvm_S90.mmp.in b/backends/platform/symbian/S90/Scummvm_S90.mmp.in
index 2655a553a4..39f6d7fc41 100644
--- a/backends/platform/symbian/S90/Scummvm_S90.mmp.in
+++ b/backends/platform/symbian/S90/Scummvm_S90.mmp.in
@@ -58,8 +58,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi
 
 // *** Include paths
 
-USERINCLUDE	    ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE		..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -69,7 +69,7 @@ SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
 
 //START_AUTO_OBJECTS_BASE_//
 
@@ -80,13 +80,13 @@ SOURCEPATH ..\..\..\base
 SOURCEPATH ..\..\..
 
 // backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+SOURCE backends\platform\sdl\events.cpp
+SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\symbian\src\SymbianOS.cpp 
-SOURCE backends\symbian\src\SymbianActions.cpp 
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp 
+SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
diff --git a/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg b/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
index a913bd15ec..452252c9e2 100644
--- a/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
+++ b/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
@@ -6,7 +6,7 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S90"},(0x101f9b57),0,80,3
+#{"ScummVM S90"},(0x101f9b57),0,90,0
 
 ; Platform type -- disabled: seems to be causing trouble
 ;(0x101FBE04), 0, 0, 0, {"Series90ProductID"}
diff --git a/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in b/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
index 9b2e432b19..fc9e765266 100644
--- a/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
+++ b/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
@@ -57,8 +57,8 @@ STATICLIBRARY egcc.lib // for __fixunsdfsi
 
 // *** Include paths
 
-USERINCLUDE	    ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE		..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -68,7 +68,7 @@ SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
 
 //START_AUTO_OBJECTS_BASE_//
 
@@ -76,16 +76,16 @@ SOURCEPATH ..\..\..\base
 
 //STOP_AUTO_OBJECTS_BASE_//
 
-SOURCEPATH ..\..\..\
+SOURCEPATH ..\..\..\..\
 
 // backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+SOURCE backends\platform\sdl\events.cpp
+SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\symbian\src\SymbianOS.cpp 
-SOURCE backends\symbian\src\SymbianActions.cpp 
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp 
+SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
diff --git a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
index 2ebf7580f9..a02dd8f920 100644
--- a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
+++ b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
@@ -6,7 +6,7 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM UIQ2"},(0x101f9b57),0,80,3
+#{"ScummVM UIQ2"},(0x101f9b57),0,90,0
 
 ; Platform type
 (0x101F617B), 2, 0, 0, {"UIQ20ProductID"}
diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
index 170140848f..3198ecd65f 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
@@ -67,6 +67,7 @@ UID             0x100039ce 0xA0000657
 MACRO			UIQ
 MACRO			UIQ3
 MACRO			EPOC_AS_APP
+ALWAYS_BUILD_AS_ARM
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -80,8 +81,8 @@ STATICLIBRARY esdl.lib
 
 // *** Include paths
 
-USERINCLUDE	    ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE		..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
 
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -91,7 +92,7 @@ SYSTEMINCLUDE   ..\src // for portdefs.h
 
 // *** SOURCE files
 
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
 
 //START_AUTO_OBJECTS_BASE_//
 
@@ -99,16 +100,16 @@ SOURCEPATH ..\..\..\base
 
 //STOP_AUTO_OBJECTS_BASE_//
 
-SOURCEPATH ..\..\..\
+SOURCEPATH ..\..\..\..\
 
 // backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+SOURCE backends\platform\sdl\events.cpp
+SOURCE backends\platform\sdl\graphics.cpp
+SOURCE backends\platform\sdl\sdl.cpp
 SOURCE backends\fs\symbian\symbian-fs.cpp
-SOURCE backends\symbian\src\SymbianOS.cpp 
-SOURCE backends\symbian\src\SymbianActions.cpp 
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp 
+SOURCE backends\platform\symbian\src\SymbianActions.cpp 
+SOURCE backends\platform\symbian\src\ScummApp.cpp
 
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index 3a47591b0a..1323b7a4ea 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -16,6 +16,8 @@
 ; Product/platform version UID, Major, Minor, Build, Product ID
 (0x101F6300), 3, 0, 0, {"UIQ30ProductID"}
 
+
+*"..\res\scummvm.key","..\res\scummvm.cer",KEY="scummvm"
 ; Application, AIF & Resource file
 "\uiq3\epoc32\release\gcce\urel\ScummVM.exe"-		"!:\sys\bin\ScummVM.exe"
 "\uiq3\epoc32\data\z\resource\apps\ScummVM.rsc"-	"!:\resource\apps\ScummVM.rsc"
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
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index bed23d5321..b8caaa2a01 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -128,6 +128,7 @@ void SymbianActions::initInstanceGame() {
 	bool is_gob = (strncmp(gameid.c_str(), "gob", 3) == 0);
 	bool is_ite = ((strncmp(gameid.c_str(), "ite", 3) == 0) ||
 				  (strncmp(gameid.c_str(), "ihnm", 4) == 0));
+	bool is_kyra = (gameid == "kyra1");
 	
 	Actions::initInstanceGame();
 
@@ -137,7 +138,7 @@ void SymbianActions::initInstanceGame() {
 
 	// Initialize keys for different actions
 	// Save
-	if (is_simon || is_gob) 
+	if (is_simon || is_gob || is_kyra) 
 		_action_enabled[ACTION_SAVE] = false;
 	else if (is_queen || is_ite) {
 		_action_enabled[ACTION_SAVE] = true;
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index 303fde726d..4afdf33fb9 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -21,7 +21,8 @@
  * $URL$
  * $Id$
  */
-
+#ifndef SYMBIAN_PORTDEFS_H
+#define SYMBIAN_PORTDEFS_H
 #include <assert.h>
 #include <stdarg.h>
 #include <string.h>
@@ -122,6 +123,9 @@
 
 	#define snprintf					scumm_snprintf
 	#define vsnprintf					scumm_vsnprintf
+	void*	symbian_malloc	(size_t _size);
+
+	#define malloc symbian_malloc
 #else // GCCE and the rest
 	#define snprintf(buf,len,args...)	sprintf(buf,args)
 	#define vsnprintf(buf,len,format,valist)	vsprintf(buf,format,valist)
@@ -146,3 +150,4 @@ namespace Symbian {
 extern void FatalError(const char *msg);
 extern char* GetExecutablePath();
 }
+#endif