SYMBIAN: Updated settings and moved to config.mmh

11 files changed, 64 insertions, 192 deletions

diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index 18a464b580..6eed7f0690 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -16,6 +16,7 @@ chdir("../../../");
 	"mmp/scummvm_cruise.mmp",
 	"mmp/scummvm_draci.mmp",
 	"mmp/scummvm_drascula.mmp",
+	"mmp/scummvm_dreamweb.mmp",
 	"mmp/scummvm_gob.mmp",
 	"mmp/scummvm_groovie.mmp",
 	"mmp/scummvm_hopkins.mmp",
@@ -25,6 +26,7 @@ chdir("../../../");
 	"mmp/scummvm_m4.mmp",
 	"mmp/scummvm_made.mmp",
 	"mmp/scummvm_mohawk.mmp",
+	"mmp/scummvm_mortevielle.mmp",
 	"mmp/scummvm_neverhood.mmp",
 	"mmp/scummvm_parallaction.mmp",
 	"mmp/scummvm_pegasus.mmp",
@@ -43,19 +45,18 @@ chdir("../../../");
 	"mmp/scummvm_touche.mmp",
 	"mmp/scummvm_tsage.mmp",
 	"mmp/scummvm_tucker.mmp",
+	"mmp/scummvm_voyeur.mmp",
 	"mmp/scummvm_wintermute.mmp",
 	# New engines
 	"mmp/scummvm_avalanche.mmp",
 	"mmp/scummvm_bbvs.mmp",
-	"mmp/scummvm_dreamweb.mmp",
+	"mmp/scummvm_cge2.mmp",
 	"mmp/scummvm_fullpipe.mmp",
 	"mmp/scummvm_lastexpress.mmp",
 	"mmp/scummvm_mads.mmp",
-	"mmp/scummvm_mortevielle.mmp",
 	"mmp/scummvm_sword25.mmp",
 	"mmp/scummvm_testbed.mmp",
 	"mmp/scummvm_zvision.mmp",
-	"mmp/scummvm_voyeur.mmp",
 	# Target Platform Project Files
 	"S60/ScummVM_S60.mmp",
 	"S60v3/ScummVM_S60v3.mmp",
@@ -92,7 +93,6 @@ Preparing to update all the Symbian MMP project files with objects from module.m
 # some modules.mk files have #ifndef ENABLE_XXXX blocks:
 my @section_empty = (""); # section standard: no #ifdef's in module.mk files
 my @sections_agos = ("", "ENABLE_AGOS2"); # special sections for engine AGOS
-my @section_video = ("", "USE_BINK"); # special sections for engine VIDEO ###, "USE_THEORADEC"
 my @sections_groovie = ("", "ENABLE_GROOVIE2"); # special sections for engine GROOVIE
 my @sections_kyra = ("", "ENABLE_LOL","ENABLE_EOB"); # special sections for engine KYRA
 my @sections_mohawk = ("", "ENABLE_CSTIME", "ENABLE_MYST", "ENABLE_RIVEN");  # special sections for engine MOHAWK
@@ -135,7 +135,7 @@ my @excludes_gui = (
 
 # the USE_ARM_* defines not parsed correctly, exclude manually:
 my @excludes_scumm = (
-	".*ARM.*",		# the *ARM.s files are added in .mpp files based on WINS/ARM build!
+	".*ARM.*",		# the *ARM.s files are added in .mmp files based on WINS/ARM build!
 	# USE_ARM_SMUSH_ASM		codec47ARM.s
 	# USE_ARM_GFX_ASM		gfxARM.s
 	# USE_ARM_COSTUME_ASM	proc3ARM.s			compiled, linked?, but *not* used :P (portdefs.h)
@@ -149,57 +149,58 @@ ParseModule("_base",	"gui",		\@section_empty,		\@excludes_gui);
 ParseModule("_base",	"graphics",	\@section_empty,		\@excludes_graphics);
 ParseModule("_base",	"image",	\@section_empty);
 ParseModule("_base",	"audio",	\@section_empty,		\@excludes_snd);
-ParseModule("_base",	"video",	\@section_video); #
+ParseModule("_base",	"video",	\@section_empty);
 
 chdir("engines/");
 ParseModule("_scumm",	"scumm",	\@sections_scumm,		\@excludes_scumm );
-ParseModule("_queen",	"queen",	\@section_empty);
+ParseModule("_agi",		"agi",		\@section_empty);
 ParseModule("_agos",	"agos",		\@sections_agos);
-ParseModule("_sky",		"sky",		\@section_empty);
-ParseModule("_gob",		"gob",		\@section_empty);
-ParseModule("_saga",	"saga",		\@sections_saga);
-ParseModule("_kyra",	"kyra",		\@sections_kyra);
-ParseModule("_sword1",	"sword1",	\@section_empty);
-ParseModule("_sword2",	"sword2",	\@section_empty);
-ParseModule("_lure",	"lure",		\@section_empty);
 ParseModule("_cine",	"cine",		\@section_empty);
-ParseModule("_cge",	    "cge",		\@section_empty);
 ParseModule("_composer","composer",	\@section_empty);
-ParseModule("_agi",		"agi",		\@section_empty);
-ParseModule("_touche",	"touche",	\@section_empty);
-ParseModule("_parallaction","parallaction",\@section_empty);
 ParseModule("_cruise",	"cruise",	\@section_empty);
+ParseModule("_cge",	    "cge",		\@section_empty);
+ParseModule("_draci",	"draci",	\@section_empty);
 ParseModule("_drascula","drascula",	\@section_empty);
-ParseModule("_made",	"made",		\@section_empty);
-ParseModule("_m4",		"m4",		\@section_empty);
-ParseModule("_tinsel",	"tinsel",	\@section_empty);
+ParseModule("_dreamweb"     ,"dreamweb",	\@section_empty);
+ParseModule("_gob",		"gob",		\@section_empty);
 ParseModule("_groovie",	"groovie",	\@sections_groovie);
-ParseModule("_tucker",	"tucker",	\@section_empty);
+ParseModule("_hopkins","hopkins",	\@section_empty);
+ParseModule("_hugo"     ,"hugo",	\@section_empty);
+ParseModule("_kyra",	"kyra",		\@sections_kyra);
+ParseModule("_lure",	"lure",		\@section_empty);
+ParseModule("_made",	"made",		\@section_empty);
+ParseModule("_mohawk"   ,"mohawk",	\@sections_mohawk);
+ParseModule("_mortevielle"  ,"mortevielle",	\@section_empty);
+ParseModule("_neverhood"  ,"neverhood",	\@section_empty);
+ParseModule("_parallaction","parallaction",\@section_empty);
+ParseModule("_pegasus","pegasus",	\@section_empty);
+ParseModule("_queen",	"queen",	\@section_empty);
+ParseModule("_saga",	"saga",		\@sections_saga);
 ParseModule("_sci",		"sci",		\@sections_sci);
-ParseModule("_draci",	"draci",	\@section_empty);
+ParseModule("_sky",		"sky",		\@section_empty);
+ParseModule("_sword1",	"sword1",	\@section_empty);
+ParseModule("_sword2",	"sword2",	\@section_empty);
 ParseModule("_teenagent","teenagent",	\@section_empty);
-ParseModule("_mohawk"   ,"mohawk",	\@sections_mohawk);
-ParseModule("_hugo"     ,"hugo",	\@section_empty);
+ParseModule("_tinsel",	"tinsel",	\@section_empty);
+ParseModule("_toltecs","toltecs",	\@section_empty);
+ParseModule("_tony",	"tony",		\@section_empty);
 ParseModule("_toon"     ,"toon",	\@section_empty);
-ParseModule("_lastexpress","lastexpress",	\@section_empty);
+ParseModule("_touche",	"touche",	\@section_empty);
 ParseModule("_tsage",	"tsage",	\@section_empty);
-ParseModule("_tony",	"tony",		\@section_empty);
-ParseModule("_toltecs","toltecs",	\@section_empty);
-ParseModule("_hopkins","hopkins",	\@section_empty);
-ParseModule("_pegasus","pegasus",	\@section_empty);
+ParseModule("_tucker",	"tucker",	\@section_empty);
+ParseModule("_voyeur"     ,"voyeur",	\@section_empty);
 ParseModule("_wintermute","wintermute",	\@section_empty);
 ##### new engines
 ParseModule("_avalanche"     ,"avalanche",	\@section_empty);
-ParseModule("_dreamweb"     ,"dreamweb",	\@section_empty);
+ParseModule("_bbvs"     	,"bbvs",	\@section_empty);
+ParseModule("_cge2"     	,"cge2",	\@section_empty);
 ParseModule("_fullpipe"     ,"fullpipe",	\@section_empty);
+ParseModule("_lastexpress","lastexpress",	\@section_empty);
+ParseModule("_m4",		"m4",		\@section_empty);
 ParseModule("_mads"			,"mads",	\@section_empty);
-ParseModule("_mortevielle"  ,"mortevielle",	\@section_empty);
-ParseModule("_neverhood"  ,"neverhood",	\@section_empty);
 ParseModule("_sword25"     ,"sword25",	\@section_empty);
 ParseModule("_testbed"     ,"testbed",	\@section_empty);
 ParseModule("_zvision"     ,"zvision",	\@section_empty);
-ParseModule("_voyeur"     ,"voyeur",	\@section_empty);
-ParseModule("_bbvs"     	,"bbvs",	\@section_empty);
 print "
 =======================================================================================
 Done. Enjoy :P
diff --git a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
index a038bd90f8..fe81ed2261 100644
--- a/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
+++ b/backends/platform/symbian/BuildPackageUpload_AllVersions.pl
@@ -64,10 +64,8 @@ $ExtraMacros .= "MACRO		ENABLE_VKEYBD\n";
 $ExtraMacros .= "MACRO		DISABLE_FANCY_THEMES\n";
 $ExtraMacros .= "MACRO		USE_TRANSLATION\n";
 $ExtraMacros .= "MACRO		USE_BINK\n";
-#$ExtraMacros .= "MACRO		USE_THEORADEC\n";
-#$ExtraMacros .= "MACRO		USE_MPEG2\n";
 # $ExtraMacros .= "MACRO		\n";
-# candidates are : , USE_TIMIDITY,
+# candidates are : USE_TIMIDITY
 
 # prep nice list of SDKs
 #while( ($SDK, $RootDir) = each(%SDK_RootDirs) )
diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index 26c2e4f69d..f9b376d674 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -2,32 +2,31 @@
 ##################################################################################################################
 
 	@WorkingEngines = qw(
-		agos agi bbvs cine cge composer cruise draci
+		agos agi cine cge composer cruise draci dreamweb
 		drascula hugo gob groovie kyra lastexpress
 		lure made mohawk parallaction pegasus queen
 		saga sci scumm sky sword1 sword2 teenagent tinsel
 		toltecs tony toon touche tsage tucker wintermute
-		dreamweb fullpipe hopkins mortevielle mads
+		bbvs fullpipe hopkins mortevielle mads cge2
 		neverhood testbed avalanche zvision voyeur
 	);
 #### New engines
 ####		sword25
 
 	@WorkingEngines_1st = qw(
-		bbvs cine composer cruise 
-		drascula groovie lastexpress
-		lure made mohawk parallaction pegasus queen
-		saga scumm 
-		toltecs tony toon touche tucker wintermute
-		neverhood avalanche zvision voyeur
+		cge2 cine composer cruise drascula groovie
+		lastexpress made parallaction queen
+		saga scumm touche tucker wintermute
+		avalanche zvision voyeur
 	);
 
 	@WorkingEngines_2nd = qw(
-		agos agi cge draci
-		hugo gob kyra
-		sci sky sword1 sword2 teenagent tinsel
-		tsage
-		dreamweb fullpipe hopkins mortevielle mads
+		agi agos bbvs cge draci gob hopkins
+		hugo kyra lure mohawk pegasus sci
+		sky sword1 sword2 teenagent mads
+		tinsel tsage toltecs tony toon
+		dreamweb fullpipe mortevielle
+		neverhood testbed
 	);
 ####		sword25
 
@@ -326,8 +325,8 @@
 	{
 		# the first one includes all SDKs & release-ready engines
 
-			$VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines";
-			#$VariationSets{'ALL'}{'split'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines";
+			# $VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines";
+			$VariationSets{'ALL'}{'split'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines";
 			# $VariationSets{'ALL'}{'1St'} = "$DefaultFeatures @WorkingEngines_1st @EnablableSubEngines";
 			# $VariationSets{'ALL'}{'2nd'} = "$DefaultFeatures @WorkingEngines_2nd @EnablableSubEngines";
 		# now one for each ready-for-release engine
diff --git a/backends/platform/symbian/mmp/config.mmh b/backends/platform/symbian/mmp/config.mmh
index 12c1fc2d2d..075697d99a 100644
--- a/backends/platform/symbian/mmp/config.mmh
+++ b/backends/platform/symbian/mmp/config.mmh
@@ -48,7 +48,7 @@ OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid l
 OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
 // -Wno-psabi turn off "note: the mangling of 'va_list' has changed in GCC 4.4"
 OPTION			GCCE -pipe -Wno-multichar -Wno-reorder -Wno-unused \
- -Wno-format -fsigned-char-Wno-psabi
+ -Wno-format -fsigned-char -Wno-psabi
 ALWAYS_BUILD_AS_ARM
 
 // *** Include paths
diff --git a/backends/platform/symbian/mmp/scummvm_agi.mmp.in b/backends/platform/symbian/mmp/scummvm_agi.mmp.in
index d6f9e54b7d..f24e3ef1a9 100644
--- a/backends/platform/symbian/mmp/scummvm_agi.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_agi.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_agi.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\agi
 
 //STOP_AUTO_OBJECTS_AGI_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_agos.mmp.in b/backends/platform/symbian/mmp/scummvm_agos.mmp.in
index d2b1329a24..ff15c8d5b0 100644
--- a/backends/platform/symbian/mmp/scummvm_agos.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_agos.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_agos.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -59,19 +56,3 @@ SOURCEPATH ..\..\..\..\engines\agos
 
 //STOP_AUTO_OBJECTS_AGOS_ENABLE_AGOS2//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in
index c3f12f6858..88aa689f5b 100644
--- a/backends/platform/symbian/mmp/scummvm_base.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in
@@ -32,12 +32,10 @@
 
 TARGET          scummvm_base.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-// using option -Wno-psabi to supress warning "note: the mangling of 'va_list' has changed in GCC 4.4"
+#include "config.mmh"
+
 // compiler must use png.h from libpng.lib instead ScummVM's
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char -Wno-psabi -I'/Symbian/S60_5th_Edition_SDK_v1.0/epoc32/include/png'
-ALWAYS_BUILD_AS_ARM
+OPTION			GCCE -I'/Symbian/S60_5th_Edition_SDK_v1.0/epoc32/include/png'
 
 // Note: the LIB:*.lib statements are used by AdaptAllMMPs.pl, so don't remove them!
 //START_AUTO_MACROS_MASTER//
@@ -50,21 +48,9 @@ ALWAYS_BUILD_AS_ARM
 
 // *** Include paths
 
-USERINCLUDE	    ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio
-USERINCLUDE		..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl
-USERINCLUDE		\epoc32\include\mpeg2dec //\epoc32\include\theora
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
+USERINCLUDE		..\..\..\..\backends\fs ..\..\..\..\backends\platform\sdl
+USERINCLUDE		\epoc32\include\mpeg2dec
+
 
 // *** SOURCE files
 
diff --git a/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in b/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in
index b4981e6eec..20d91a910d 100644
--- a/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_bbvs.mmp.in
@@ -33,10 +33,7 @@
 
 TARGET          scummvm_bbvs.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -54,19 +51,3 @@ SOURCEPATH ..\..\..\..\engines\bbvs
 
 //STOP_AUTO_OBJECTS_BBVS_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_cge.mmp.in b/backends/platform/symbian/mmp/scummvm_cge.mmp.in
index 35cb0f2f98..29bdad0600 100644
--- a/backends/platform/symbian/mmp/scummvm_cge.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cge.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_cge.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\cge
 
 //STOP_AUTO_OBJECTS_CGE_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_cine.mmp.in b/backends/platform/symbian/mmp/scummvm_cine.mmp.in
index 99b45cddb8..f93cd30c9f 100644
--- a/backends/platform/symbian/mmp/scummvm_cine.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_cine.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_CINE.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -55,17 +52,3 @@ SOURCEPATH ..\..\..\..\engines\cine
 
 // *** Include paths
 
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h
diff --git a/backends/platform/symbian/mmp/scummvm_composer.mmp.in b/backends/platform/symbian/mmp/scummvm_composer.mmp.in
index 5a215f2d8d..72117fbc19 100644
--- a/backends/platform/symbian/mmp/scummvm_composer.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_composer.mmp.in
@@ -32,10 +32,7 @@
 
 TARGET          scummvm_COMPOSER.lib
 TARGETTYPE      lib
-OPTION			MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
-OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
-OPTION			GCCE -Wno-multichar -Wno-reorder -Wno-unused -Wno-format -fsigned-char
-ALWAYS_BUILD_AS_ARM
+#include "config.mmh"
 
 //START_AUTO_MACROS_SLAVE//
 
@@ -53,19 +50,3 @@ SOURCEPATH ..\..\..\..\engines\COMPOSER
 
 //STOP_AUTO_OBJECTS_COMPOSER_//
 
-// *** Include paths
-
-USERINCLUDE     ..\..\..\..\engines
-USERINCLUDE     ..\..\..\.. ..\..\..\..\gui ..\..\..\..\audio ..\src
-
-SYSTEMINCLUDE	\epoc32\include\freetype
-SYSTEMINCLUDE	\epoc32\include\mpeg2dec
-SYSTEMINCLUDE   \epoc32\include\jpeg
-SYSTEMINCLUDE   \epoc32\include\png
-SYSTEMINCLUDE	\epoc32\include\ESDL
-SYSTEMINCLUDE	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
-SYSTEMINCLUDE   \epoc32\include\libc
-SYSTEMINCLUDE 	\epoc32\include\theora
-SYSTEMINCLUDE   \epoc32\include\tremor
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   ..\src // for portdefs.h