Updated symbian actions and build scripts. Run updateMMPs to updated all MMPS based on the base mmp

svn-id: r18904

16 files changed, 293 insertions, 159 deletions

diff --git a/backends/epoc/SymbianActions.cpp b/backends/epoc/SymbianActions.cpp
index 2d347f0c5b..5c76dc9da2 100644
--- a/backends/epoc/SymbianActions.cpp
+++ b/backends/epoc/SymbianActions.cpp
@@ -35,10 +35,10 @@ namespace GUI {
 
 // SumthinWicked says: we either split our Actions like WinCE did with Pocket/Smartphone
 // or we put them in this file separated by #ifdefs, this one is up to you, AnotherGuest :)
-
-const Common::String actionNames[] = {
-	"Up",
-	"Down",
+ 
+const Common::String actionNames[] = { 
+	"Up", 
+	"Down", 
 	"Left",
 	"Right",
 	"Left Click",
@@ -48,8 +48,8 @@ const Common::String actionNames[] = {
 	"Zone",
 	"FT Cheat",
 	"Swap character",
-	"Skip text",
-	"Pause",
+	"Skip text",	
+	"Pause", 
 	"Quit"
 };
 
@@ -58,7 +58,7 @@ static const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0x11a, 0x11b, SDLK
 #elif defined (S60)
 const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, '*', '#', '0',0,0,0,0,0};
 #else
-const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0x11a, 0x11b, SDLK_MENU, VK_ESCAPE, '9', 0,0,0,0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0x11a, 0x11b, SDLK_MENU, SDLK_ESCAPE, 0, 0,0,0,0,0};
 #endif
 // creator function according to Factory Pattern
 void SymbianActions::init(GameDetector &detector) {
@@ -96,7 +96,7 @@ SymbianActions::SymbianActions(GameDetector &detector) :
 
 void SymbianActions::initInstanceMain(OSystem *mainSystem) {
 	Actions::initInstanceMain(mainSystem);
-
+	
 	// Mouse Up
 	_action_enabled[ACTION_UP] = true;
 
@@ -125,7 +125,7 @@ void SymbianActions::initInstanceGame() {
 	bool is_sky = (_detector->_targetName == "sky");
 	bool is_queen = (_detector->_targetName == "queen");
 	bool is_gob = (strncmp(_detector->_targetName.c_str(), "gob", 3) == 0);
-
+	
 	Actions::initInstanceGame();
 
 	// See if a right click mapping could be needed
@@ -134,7 +134,7 @@ void SymbianActions::initInstanceGame() {
 
 	// Initialize keys for different actions
 	// Save
-	if (is_simon || is_gob)
+	if (is_simon || is_gob) 
 		_action_enabled[ACTION_SAVE] = false;
 	else
 	if (is_queen) {
@@ -144,7 +144,7 @@ void SymbianActions::initInstanceGame() {
 	else
 	if (is_sky) {
 		_action_enabled[ACTION_SAVE] = true;
-		_key_action[ACTION_SAVE].setAscii(63);
+		_key_action[ACTION_SAVE].setAscii(63); 
 	}
 	else {
 		_action_enabled[ACTION_SAVE] = true;
diff --git a/backends/epoc/build/S60/EScummVM_080.pkg b/backends/epoc/build/S60/EScummVM_080.pkg
index 51cb3e394c..8acf246f0f 100644
--- a/backends/epoc/build/S60/EScummVM_080.pkg
+++ b/backends/epoc/build/S60/EScummVM_080.pkg
@@ -12,11 +12,11 @@
 (0x101F6F88), 0, 0, 0, {"Series60ProductID"}
 
 ; Signature
-*"EScummVM.key","EScummVM.cer"
+*"..\EScummVM.key","..\EScummVM.cer"
 
 ; Application file Launcher and actual exe
-"..\..\\epoc32\release\armi\urel\EScummVMS60.app"-"!:\system\apps\EScummVMS60\EScummVMS60.app"
-"\epoc32\release\armi\urel\EScummVM.exe"-":\system\apps\EScummVMS60\EScummVM.exe"
+"\epoc32\release\armi\urel\EScummVMS60.app"-"!:\system\apps\EScummVMS60\EScummVMS60.app"
+"\epoc32\release\armi\urel\EScummVM.exe"-"!:\system\apps\EScummVMS60\EScummVM.exe"
 
 ; AIF application information file
 "\epoc32\data\z\system\apps\EScummVMS60\EScummVMS60.aif"-"!:\system\apps\EScummVMS60\EScummVMS60.aif"
@@ -25,7 +25,7 @@
 "\epoc32\data\z\system\apps\EScummVMS60\EScummVMS60.rsc"-"!:\system\apps\EScummVMS60\EScummVMS60.rsc"
 
 ; Empty .placeholder file, ensures creation of c:\documents\EScummVM\ for future file saves
-".placeholder"-"c:\documents\EScummVM\.placeholder"
+"..\.placeholder"-"c:\documents\EScummVM\.placeholder"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\documents\EScummVM\scummvm.ini",FN
diff --git a/backends/epoc/build/S60/EScummVM_S60_EXE.mmp b/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
index f99485a277..bbb6d4f7fa 100644
--- a/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
+++ b/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
@@ -34,46 +34,42 @@
 #endif
 TARGETPATH      system\apps\EScummVMs60
 TARGETTYPE      EXEDLL
-				// /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			MSVC  /QIfist /Ob1 /Oy /GF 
-//OPTION			GCC -O3 -funroll-loops -finline-functions -ffast-math -frerun-loop-opt -fconserve-space -fexpensive-optimizations -Wno-multichar -Wno-reorder
-sourcepath ..\
 
-EPOCSTACKSIZE	0x00008000
+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
 
-EPOCHEAPSIZE	1024	5242880
+EPOCSTACKSIZE	0x00008000
+EPOCHEAPSIZE	1024	8192000
 
 MACRO			S60
-MACRO			NONSTANDARD_PORT
 
-// these need too high a resolution
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
+MACRO			NONSTANDARD_PORT
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
 MACRO			DISABLE_SWORD1
 MACRO			DISABLE_SWORD2
-// these are not ready to be released
-//MACRO			DISABLE_SAGA
-MACRO			DISABLE_KYRA
-// these work, so don't disable them :)
-//MACRO			DISABLE_SIMON
-//MACRO			DISABLE_SKY
-//MACRO			DISABLE_QUEEN
-//MACRO			DISABLE_GOB
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+
+// automagically enabled static libs from macros above
+STATICLIBRARY	scummvm_scumm.lib
+STATICLIBRARY	scummvm_simon.lib
+STATICLIBRARY	scummvm_sky.lib
+STATICLIBRARY	scummvm_queen.lib
+STATICLIBRARY	scummvm_gob.lib
+STATICLIBRARY	scummvm_saga.lib
+STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs
+STATICLIBRARY	libmad.lib
+STATICLIBRARY	zlib.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** Static Libraries
 
-STATICLIBRARY scummvm_scumm.lib
-STATICLIBRARY scummvm_simon.lib
-STATICLIBRARY scummvm_sky.lib
-STATICLIBRARY scummvm_queen.lib
-STATICLIBRARY scummvm_gob.lib
-STATICLIBRARY scummvm_saga.lib
-STATICLIBRARY scummvm_base.lib
-
-STATICLIBRARY libmad.lib
-STATICLIBRARY zlib.lib
 STATICLIBRARY esdl_exe.lib
 #if !defined(WINS)
 STATICLIBRARY egcc.lib // for __fixunsdfsi
 #endif
+
 // *** Include paths
 
 USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui
@@ -108,6 +104,7 @@ SOURCE backends\epoc\ScummApp.cpp
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
+
 // *** Dynamic Libraries
 
 LIBRARY cone.lib  eikcore.lib 
@@ -115,5 +112,4 @@ LIBRARY euser.lib apparc.lib fbscli.lib
 LIBRARY estlib.lib apgrfx.lib
 LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
-LIBRARY AVKON.LIB
 
diff --git a/backends/epoc/build/S80/EScummVM_S80.mmp b/backends/epoc/build/S80/EScummVM_S80.mmp
index b9050f92cd..4ebed7289e 100644
--- a/backends/epoc/build/S80/EScummVM_S80.mmp
+++ b/backends/epoc/build/S80/EScummVM_S80.mmp
@@ -34,45 +34,42 @@
 #endif
 TARGETPATH      system\apps\EScummVMs80
 TARGETTYPE      EXEDLL
-				// /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			MSVC  /QIfist /Ob1 /Oy /GF 
-//OPTION			GCC -O3 -funroll-loops -finline-functions -ffast-math -frerun-loop-opt -fconserve-space -fexpensive-optimizations -Wno-multichar -Wno-reorder
-sourcepath ..\
-EPOCSTACKSIZE	0x00008000
 
-EPOCHEAPSIZE	1024	5242880
+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
+
+EPOCSTACKSIZE	0x00008000
+EPOCHEAPSIZE	1024	8192000
 
 MACRO			S80
-MACRO			NONSTANDARD_PORT
 
-// these need too high a resolution
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
+MACRO			NONSTANDARD_PORT
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
 MACRO			DISABLE_SWORD1
 MACRO			DISABLE_SWORD2
-// these are not ready to be released
-//MACRO			DISABLE_SAGA
-MACRO			DISABLE_KYRA
-// these work, so don't disable them :)
-//MACRO			DISABLE_SIMON
-//MACRO			DISABLE_SKY
-//MACRO			DISABLE_QUEEN
-//MACRO			DISABLE_GOB
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+
+// automagically enabled static libs from macros above
+STATICLIBRARY	scummvm_scumm.lib
+STATICLIBRARY	scummvm_simon.lib
+STATICLIBRARY	scummvm_sky.lib
+STATICLIBRARY	scummvm_queen.lib
+STATICLIBRARY	scummvm_gob.lib
+STATICLIBRARY	scummvm_saga.lib
+STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs
+STATICLIBRARY	libmad.lib
+STATICLIBRARY	zlib.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** Static Libraries
 
-STATICLIBRARY scummvm_scumm.lib
-STATICLIBRARY scummvm_simon.lib
-STATICLIBRARY scummvm_sky.lib
-STATICLIBRARY scummvm_queen.lib
-STATICLIBRARY scummvm_gob.lib
-STATICLIBRARY scummvm_saga.lib
-STATICLIBRARY scummvm_base.lib
-
-STATICLIBRARY libmad.lib
-STATICLIBRARY zlib.lib
 STATICLIBRARY esdl.lib
 #if !defined(WINS)
 STATICLIBRARY egcc.lib // for __fixunsdfsi
 #endif
+
 // *** Include paths
 
 USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui
@@ -107,6 +104,7 @@ SOURCE backends\epoc\ScummApp.cpp
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
+
 // *** Dynamic Libraries
 
 LIBRARY cone.lib  eikcore.lib 
diff --git a/backends/epoc/build/S90/EScummvm_S90.mmp b/backends/epoc/build/S90/EScummvm_S90.mmp
index f1ce6190f5..2d1c00341f 100644
--- a/backends/epoc/build/S90/EScummvm_S90.mmp
+++ b/backends/epoc/build/S90/EScummvm_S90.mmp
@@ -34,45 +34,42 @@
 #endif
 TARGETPATH      system\apps\EScummVMs90
 TARGETTYPE      EXEDLL
-				// /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			MSVC  /QIfist /Ob1 /Oy /GF 
-//OPTION			GCC -O3 -funroll-loops -finline-functions -ffast-math -frerun-loop-opt -fconserve-space -fexpensive-optimizations -Wno-multichar -Wno-reorder
-sourcepath ..\
-EPOCSTACKSIZE	0x00008000
 
-EPOCHEAPSIZE	1024	5242880
+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
+
+EPOCSTACKSIZE	0x00008000
+EPOCHEAPSIZE	1024	8192000
 
 MACRO			S90
-MACRO			NONSTANDARD_PORT
 
-// these need too high a resolution
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
+MACRO			NONSTANDARD_PORT
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
 MACRO			DISABLE_SWORD1
 MACRO			DISABLE_SWORD2
-// these are not ready to be released
-//MACRO			DISABLE_SAGA
-MACRO			DISABLE_KYRA
-// these work, so don't disable them :)
-//MACRO			DISABLE_SIMON
-//MACRO			DISABLE_SKY
-//MACRO			DISABLE_QUEEN
-//MACRO			DISABLE_GOB
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+
+// automagically enabled static libs from macros above
+STATICLIBRARY	scummvm_scumm.lib
+STATICLIBRARY	scummvm_simon.lib
+STATICLIBRARY	scummvm_sky.lib
+STATICLIBRARY	scummvm_queen.lib
+STATICLIBRARY	scummvm_gob.lib
+STATICLIBRARY	scummvm_saga.lib
+STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs
+STATICLIBRARY	libmad.lib
+STATICLIBRARY	zlib.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** Static Libraries
 
-STATICLIBRARY scummvm_scumm.lib
-STATICLIBRARY scummvm_simon.lib
-STATICLIBRARY scummvm_sky.lib
-STATICLIBRARY scummvm_queen.lib
-STATICLIBRARY scummvm_gob.lib
-STATICLIBRARY scummvm_saga.lib
-STATICLIBRARY scummvm_base.lib
-
-STATICLIBRARY libmad.lib
-STATICLIBRARY zlib.lib
 STATICLIBRARY esdl.lib
 #if !defined(WINS)
 STATICLIBRARY egcc.lib // for __fixunsdfsi
 #endif
+
 // *** Include paths
 
 USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui
@@ -107,6 +104,7 @@ SOURCE backends\epoc\ScummApp.cpp
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
+
 // *** Dynamic Libraries
 
 LIBRARY cone.lib  eikcore.lib 
diff --git a/backends/epoc/build/UIQ/BLD.INF b/backends/epoc/build/UIQ/BLD.INF
index 458f0c02c8..4e338ea818 100644
--- a/backends/epoc/build/UIQ/BLD.INF
+++ b/backends/epoc/build/UIQ/BLD.INF
@@ -2,6 +2,10 @@ PRJ_PLATFORMS
 WINS ARMI // ARM4 THUMB
 
 PRJ_MMPFILES
+//..\..\..\..\..\ESDL\Epoc\UIQ\ESDL_UIQ.mmp
+//..\..\..\..\..\zlib-1.2.2\epoc\zlib.mmp
+//..\..\..\..\..\tremor\epoc\tremor.mmp
+//..\..\..\..\..\libmad-0.15.1b\epoc\libmad.mmp
 ..\scummvm_scumm.mmp
 ..\scummvm_simon.mmp
 ..\scummvm_sky.mmp
diff --git a/backends/epoc/build/UIQ/EScummVM_080.pkg b/backends/epoc/build/UIQ/EScummVM_080.pkg
index 7dabed2d08..d3d0caf5d0 100644
--- a/backends/epoc/build/UIQ/EScummVM_080.pkg
+++ b/backends/epoc/build/UIQ/EScummVM_080.pkg
@@ -12,19 +12,20 @@
 (0x101F617B), 2, 0, 0, {"UIQ20ProductID"}
 
 ; Signature
-*"EScummVM.key","EScummVM.cer"
+*"..\EScummVM.key","..\EScummVM.cer"
 
 ; Application file
-"..\..\..\..\UIQ_21\epoc32\release\armi\urel\EScummVM.app"-"!:\system\apps\EScummVM\EScummVM.app"
+"..\..\..\..\..\UIQ_21\epoc32\release\armi\urel\EScummVM.app"-"!:\system\apps\EScummVM\EScummVM.app"
 
 ; AIF application information file
-"..\..\..\..\UIQ_21\epoc32\data\z\system\apps\EScummVM\EScummVM.aif"-"!:\system\apps\EScummVM\EScummVM.aif"
+;"..\..\..\..\..\UIQ_21\epoc32\data\z\system\apps\EScummVM\EScummVM.aif"-"!:\system\apps\EScummVM\EScummVM.aif"
+"EScummVM.aif"-"!:\system\apps\EScummVM\EScummVM.aif"
 
 ; Resource file
-"..\..\..\..\UIQ_21\epoc32\data\z\system\apps\EScummVM\EScummVM.rsc"-"!:\system\apps\EScummVM\EScummVM.rsc"
+"..\..\..\..\..\UIQ_21\epoc32\data\z\system\apps\EScummVM\EScummVM.rsc"-"!:\system\apps\EScummVM\EScummVM.rsc"
 
 ; Empty .placeholder file, ensures creation of c:\documents\EScummVM\ for future file saves
-".placeholder"-"c:\documents\EScummVM\.placeholder"
+"..\.placeholder"-"c:\documents\EScummVM\.placeholder"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\documents\EScummVM\scummvm.ini",FN
diff --git a/backends/epoc/build/UIQ/EScummVM_UIQ.mmp b/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
index b7e8d0a959..5e59e85a8b 100644
--- a/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
+++ b/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
@@ -36,37 +36,34 @@ OPTION			GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way
 
 RESOURCE		EScummVM.rss
 EPOCSTACKSIZE	0x80008000 // this enables ECompXL app compression
-AIF			EScummVm.Aif ..\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp // mine still fails: I think it's because I have JRE 1.5 instead of 1.3 :P
+//AIF			EScummVm.Aif ..\ ScummVmAif.rss c16 ScummL.bmp ScummLM.bmp ScummS.bmp ScummSM.bmp // mine still fails: I think it's because I have JRE 1.5 instead of 1.3 :P
 UID             0x100039ce 0x101f9b57
 
 MACRO			UIQ
-MACRO			NONSTANDARD_PORT
 MACRO			EPOC_AS_APP
 
-// these need too high a resolution
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
+MACRO			NONSTANDARD_PORT
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
 MACRO			DISABLE_SWORD1
 MACRO			DISABLE_SWORD2
-// these are not ready to be released
-//MACRO			DISABLE_SAGA
-MACRO			DISABLE_KYRA
-// these work, so don't disable them, left here because during dev you might wanna turn them off once in a while :)
-//MACRO			DISABLE_SIMON
-//MACRO			DISABLE_SKY
-//MACRO			DISABLE_QUEEN
-//MACRO			DISABLE_GOB
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+
+// automagically enabled static libs from macros above
+STATICLIBRARY	scummvm_scumm.lib
+STATICLIBRARY	scummvm_simon.lib
+STATICLIBRARY	scummvm_sky.lib
+STATICLIBRARY	scummvm_queen.lib
+STATICLIBRARY	scummvm_gob.lib
+STATICLIBRARY	scummvm_saga.lib
+STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs
+STATICLIBRARY	libmad.lib
+STATICLIBRARY	zlib.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** Static Libraries
 
-STATICLIBRARY scummvm_scumm.lib
-STATICLIBRARY scummvm_simon.lib
-STATICLIBRARY scummvm_sky.lib
-STATICLIBRARY scummvm_queen.lib
-STATICLIBRARY scummvm_gob.lib
-STATICLIBRARY scummvm_saga.lib
-STATICLIBRARY scummvm_base.lib
-
-STATICLIBRARY libmad.lib
-STATICLIBRARY zlib.lib
 STATICLIBRARY esdl.lib
 #if !defined(WINS)
 STATICLIBRARY egcc.lib // for __fixunsdfsi
diff --git a/backends/epoc/build/scummvm_base.mmp b/backends/epoc/build/scummvm_base.mmp
index bf667ce972..c3549b3ea6 100644
--- a/backends/epoc/build/scummvm_base.mmp
+++ b/backends/epoc/build/scummvm_base.mmp
@@ -32,21 +32,26 @@ 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
 
+// Note: the LIB:*.lib statements are used by updateMMPs.pl, so don't remove them!
+//START_AUTO_MACROS_MASTER//
 MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD
-MACRO			USE_ZLIB
-
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
+//MACRO			USE_TREMOR			// LIB:libtremor.lib
+//MACRO			USE_VORBIS
 // these need too high a resolution
 MACRO			DISABLE_SWORD1
 MACRO			DISABLE_SWORD2
 // these are not ready to be released
-//MACRO			DISABLE_SAGA
-MACRO			DISABLE_KYRA
-// these work, so don't disable them :)
-//MACRO			DISABLE_SIMON
-//MACRO			DISABLE_SKY
-//MACRO			DISABLE_QUEEN
-//MACRO			DISABLE_GOB
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+// these work, so don't disable them, left here because during dev you might wanna turn them off once in a while :)
+//MACRO			DISABLE_SCUMM		// LIB:scummvm_scumm.lib
+//MACRO			DISABLE_SIMON		// LIB:scummvm_simon.lib
+//MACRO			DISABLE_SKY			// LIB:scummvm_sky.lib
+//MACRO			DISABLE_QUEEN		// LIB:scummvm_queen.lib
+//MACRO			DISABLE_GOB			// LIB:scummvm_gob.lib
+//MACRO			DISABLE_SAGA		// LIB:scummvm_saga.lib
+//STOP_AUTO_MACROS_MASTER//
 
 // *** Include paths
 
@@ -56,6 +61,7 @@ USERINCLUDE		..\..\..\backends\fs ..\..\..\backends\epoc ..\..\..\backends\sdl
 SYSTEMINCLUDE 	\epoc32\include\ESDL
 SYSTEMINCLUDE 	\epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
 SYSTEMINCLUDE   \epoc32\include\libc 
+//SYSTEMINCLUDE   \epoc32\include\tremor -- don't need this: refs are direct: "tremor/includexx.h"
 SYSTEMINCLUDE   \epoc32\include
 SYSTEMINCLUDE   ..\..\..\backends\epoc // for portdefs.h
 
@@ -63,7 +69,7 @@ SYSTEMINCLUDE   ..\..\..\backends\epoc // for portdefs.h
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_COMMON_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_COMMON_// Updated @ Sat Sep 17 16:14:29 2005
 SOURCE common\config-file.cpp
 SOURCE common\config-manager.cpp
 SOURCE common\file.cpp
@@ -77,7 +83,7 @@ SOURCE common\savefile.cpp
 SOURCE common\system.cpp
 //STOP_AUTO_OBJECTS_COMMON_//
 
-//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Sat Sep 17 16:14:29 2005
 SOURCE graphics\animation.cpp
 SOURCE graphics\consolefont.cpp
 SOURCE graphics\font.cpp
@@ -90,11 +96,12 @@ SOURCE graphics\surface.cpp
 //STOP_AUTO_OBJECTS_GRAPHICS_//
 
 // these next three will go into gui\modules.mk and will end up in START_AUTO_OBJECTS_GUI
+// for now they are in the phone platform specific MMP files because of library dependency probs
 //SOURCE gui\Key.cpp
 //SOURCE gui\KeysDialog.cpp
 //SOURCE gui\Actions.cpp
 
-//START_AUTO_OBJECTS_GUI_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_GUI_// Updated @ Sat Sep 17 16:14:29 2005
 SOURCE gui\about.cpp
 SOURCE gui\browser.cpp
 SOURCE gui\chooser.cpp
@@ -113,7 +120,7 @@ SOURCE gui\TabWidget.cpp
 SOURCE gui\widget.cpp
 //STOP_AUTO_OBJECTS_GUI_//
 
-//START_AUTO_OBJECTS_SOUND_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_SOUND_// Updated @ Sat Sep 17 16:14:30 2005
 SOURCE sound\adpcm.cpp
 SOURCE sound\audiocd.cpp
 SOURCE sound\audiostream.cpp
diff --git a/backends/epoc/build/scummvm_gob.mmp b/backends/epoc/build/scummvm_gob.mmp
index c580f4bb0c..d3cba071cf 100644
--- a/backends/epoc/build/scummvm_gob.mmp
+++ b/backends/epoc/build/scummvm_gob.mmp
@@ -32,13 +32,20 @@ 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
 
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
 MACRO			NONSTANDARD_PORT
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
+MACRO			DISABLE_SWORD1
+MACRO			DISABLE_SWORD2
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** SOURCE files
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_GOB_// Updated @ Mon Jun  6 23:07:22 2005
+//START_AUTO_OBJECTS_GOB_// Updated @ Sat Sep 17 16:14:30 2005
 SOURCE gob\anim.cpp
 SOURCE gob\cdrom.cpp
 SOURCE gob\dataio.cpp
diff --git a/backends/epoc/build/scummvm_queen.mmp b/backends/epoc/build/scummvm_queen.mmp
index 699a004f7b..22e0df712e 100644
--- a/backends/epoc/build/scummvm_queen.mmp
+++ b/backends/epoc/build/scummvm_queen.mmp
@@ -32,14 +32,20 @@ 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
 
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
 MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
+MACRO			DISABLE_SWORD1
+MACRO			DISABLE_SWORD2
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** SOURCE files
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_QUEEN_// Updated @ Mon Jun  6 23:07:22 2005
+//START_AUTO_OBJECTS_QUEEN_// Updated @ Sat Sep 17 16:14:30 2005
 SOURCE queen\bankman.cpp
 SOURCE queen\command.cpp
 SOURCE queen\credits.cpp
diff --git a/backends/epoc/build/scummvm_saga.mmp b/backends/epoc/build/scummvm_saga.mmp
index 3fe444425e..899cc7ec5b 100644
--- a/backends/epoc/build/scummvm_saga.mmp
+++ b/backends/epoc/build/scummvm_saga.mmp
@@ -32,13 +32,20 @@ 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
 
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
 MACRO			NONSTANDARD_PORT
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
+MACRO			DISABLE_SWORD1
+MACRO			DISABLE_SWORD2
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** SOURCE files
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_SAGA_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_SAGA_// Updated @ Sat Sep 17 16:14:30 2005
 SOURCE saga\actor.cpp
 SOURCE saga\animation.cpp
 SOURCE saga\console.cpp
@@ -66,7 +73,6 @@ SOURCE saga\sfuncs.cpp
 SOURCE saga\sndres.cpp
 SOURCE saga\sprite.cpp
 SOURCE saga\sthread.cpp
-SOURCE saga\text.cpp
 SOURCE saga\input.cpp
 SOURCE saga\music.cpp
 SOURCE saga\sound.cpp
diff --git a/backends/epoc/build/scummvm_scumm.mmp b/backends/epoc/build/scummvm_scumm.mmp
index cd200e7836..727a9d8141 100644
--- a/backends/epoc/build/scummvm_scumm.mmp
+++ b/backends/epoc/build/scummvm_scumm.mmp
@@ -21,7 +21,6 @@
  * $Header: 
  */
 
-
 //
 // EPOC MMP makefile project for ScummVM
 //
@@ -33,15 +32,20 @@ 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
 
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
 MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD
-MACRO			USE_ZLIB
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
+MACRO			DISABLE_SWORD1
+MACRO			DISABLE_SWORD2
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** SOURCE files
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_SCUMM_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_SCUMM_// Updated @ Sat Sep 17 16:14:30 2005
 SOURCE scumm\actor.cpp
 SOURCE scumm\akos.cpp
 SOURCE scumm\base-costume.cpp
diff --git a/backends/epoc/build/scummvm_simon.mmp b/backends/epoc/build/scummvm_simon.mmp
index ed9fbd8679..123ab46397 100644
--- a/backends/epoc/build/scummvm_simon.mmp
+++ b/backends/epoc/build/scummvm_simon.mmp
@@ -21,7 +21,6 @@
  * $Header: 
  */
 
-
 //
 // EPOC MMP makefile project for ScummVM
 //
@@ -33,14 +32,20 @@ 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
 
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
 MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
+MACRO			DISABLE_SWORD1
+MACRO			DISABLE_SWORD2
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** SOURCE files
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_SIMON_// Updated @ Mon Jun  6 23:07:22 2005
+//START_AUTO_OBJECTS_SIMON_// Updated @ Sat Sep 17 16:14:30 2005
 SOURCE simon\charset.cpp
 SOURCE simon\cursor.cpp
 SOURCE simon\debug.cpp
diff --git a/backends/epoc/build/scummvm_sky.mmp b/backends/epoc/build/scummvm_sky.mmp
index 985b0f8d0b..36bc6dc74d 100644
--- a/backends/epoc/build/scummvm_sky.mmp
+++ b/backends/epoc/build/scummvm_sky.mmp
@@ -21,7 +21,6 @@
  * $Header: 
  */
 
-
 //
 // EPOC MMP makefile project for ScummVM
 //
@@ -33,14 +32,20 @@ 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
 
+//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
 MACRO			NONSTANDARD_PORT
-MACRO			USE_MAD
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
+MACRO			DISABLE_SWORD1
+MACRO			DISABLE_SWORD2
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+//STOP_AUTO_MACROS_SLAVE//
 
 // *** SOURCE files
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_SKY_// Updated @ Mon Jun  6 23:07:22 2005
+//START_AUTO_OBJECTS_SKY_// Updated @ Sat Sep 17 16:14:30 2005
 SOURCE sky\autoroute.cpp
 SOURCE sky\compact.cpp
 SOURCE sky\control.cpp
diff --git a/backends/epoc/build/updateMMPs.pl b/backends/epoc/build/updateMMPs.pl
index 648821889c..1b3ea77fb0 100644
--- a/backends/epoc/build/updateMMPs.pl
+++ b/backends/epoc/build/updateMMPs.pl
@@ -12,27 +12,44 @@ $buildDir = getcwd();
 chdir("../../../");
 
 my @std = (""); # section standard, no #ifdef
-#my @sec = ("", "DISABLE_SCUMM_7_8", "DISABLE_HE"); # sections for scumm DISABLED_s
 my @exc = ("mt32","fluidsynth"); # exclusions for sound
 
-#arseModule(mmpStr,		dirStr,		ifdefArray,	[exclusionsArray])
-#ParseModule("_base",	"base",		\@std); # now in EScummVM_TRG.mmp, these never change anyways...
+#arseModule(mmpStr,		dirStr,		ifdefArray,		[exclusionsArray])
+#ParseModule("_base",	"base",		\@std); # now in ./TRG/EScummVM_TRG.mmp, these never change anyways...
 ParseModule("_base",	"common",	\@std);
 ParseModule("_base",	"gui",		\@std);
 ParseModule("_base",	"graphics",	\@std);
 ParseModule("_base",	"sound",	\@std,		\@exc);
 
-ParseModule("_scumm",	"scumm",	\@std); #\@sec # no more: enabled all again
+ParseModule("_scumm",	"scumm",	\@std);
 ParseModule("_queen",	"queen",	\@std);
 ParseModule("_simon",	"simon",	\@std);
 ParseModule("_sky",		"sky",		\@std);
 ParseModule("_gob",		"gob",		\@std);
-ParseModule("_saga",		"saga",		\@std);
+ParseModule("_saga",	"saga",		\@std);
+ParseModule("_kyra",	"kyra",		\@std);
+
+print "
+=======================================================================================
+Updating slave MACRO settings in MMP files from master 'scummvm_base.mmp'
+=======================================================================================
+
+";
+
+@mmp_files = (	"scummvm_scumm.mmp", "scummvm_queen.mmp", "scummvm_simon.mmp", "scummvm_sky.mmp", "scummvm_gob.mmp", "scummvm_saga.mmp", "scummvm_kyra.mmp", 
+				"UIQ/EScummVM_UIQ.mmp", "S60/EScummVM_S60_EXE.mmp", "S80/EScummVM_S80.mmp", "S90/EScummVM_S90.mmp");
+
+UpdateSlaveMacros();
+
 print "
 =======================================================================================
 Done. Enjoy :P
 =======================================================================================
 ";
+
+##################################################################################################################
+##################################################################################################################
+
 # parses multiple sections per mmp/module 
 sub ParseModule
 {
@@ -47,6 +64,8 @@ sub ParseModule
 	}
 }
 
+##################################################################################################################
+
 # parses all module.mk files in a dir and its subdirs
 sub CheckForModuleMK
 {
@@ -120,6 +139,8 @@ sub CheckForModuleMK
 	}
 }
 
+##################################################################################################################
+
 # update an MMP project file with the new objects
 sub UpdateProjectFile
 {
@@ -137,10 +158,6 @@ sub UpdateProjectFile
 	my @lines = <FILE>;
 	close FILE;
 	
-#	open FILE, ">$file~";
-#	print FILE @lines;
-#	close FILE;
-
 	my $onestr = join("",@lines);
 	$onestr =~ s/$a.*$b/$a$updated\n$output$b/s;
 	
@@ -152,5 +169,88 @@ sub UpdateProjectFile
 	
 	$output = "";
 }
+
+##################################################################################################################
+
+sub UpdateSlaveMacros
+{
+	my $updated = " Updated @ ".localtime();
+
+	my $name = "scummvm_base.mmp";	
+	my $file = "$buildDir/$name";
+	print "Reading master MACROS from backends/epoc/build/$name ... ";
+
+	open FILE, "$file";
+	my @lines = <FILE>;
+	close FILE;
+	my $onestr = join("",@lines);
+
+	my $n = "AUTO_MACROS_MASTER";
+	my $a = "\/\/START_$n\/\/";
+	my $b = "\/\/STOP_$n\/\/";
+	$onestr =~ /$a(.*)$b/s;
+	my $macros = $1;
 	
-	
\ No newline at end of file
+	my $libs = "\n// automagically enabled static libs from macros above\n";
+	my $libZ = "STATICLIBRARY	scummvm_base.lib // must be above USE_* .libs\n";
+	my $macro_counter = 0;
+	my $macros2 = "\n"; # output
+
+	foreach $line (split("\n", $macros))
+	{
+		# do we need to add a static .lib?
+		if ($line =~ /^.*MACRO\s*([A-Z_]*)\s*\/\/\s*LIB\:(.*)$/)
+		{
+			my $macro = $1; my $lib = $2;
+			
+			# this macro enabled? then also add the .lib
+			if ($line =~ /^\s*MACRO\s*$macro/m)
+			{
+				$libZ .= "STATICLIBRARY	$lib\n" if ($macro =~ /^USE_/);
+			}
+			else
+			{
+				$libs .= "STATICLIBRARY	$lib\n" if ($macro =~ /^DISABLE_/);
+			}
+			$macro_counter++;
+		}
+		# no comment? add the macro
+		if ($line =~ /^\s*MACRO/)
+		{
+			$macros2 .= "$line\n";
+		}
+	}		
+
+	print "$macro_counter macro lines.\n";
+
+	$n = "AUTO_MACROS_SLAVE";
+	$a = "\/\/START_$n\/\/";
+	$b = "\/\/STOP_$n\/\/";
+	
+	foreach $name (@mmp_files)
+	{
+		$file = "$buildDir/$name";
+		print "Updating macros in backends/epoc/build/$name ... ";
+	
+		open FILE, "$file";
+		@lines = <FILE>;
+		close FILE;
+		
+		$onestr = join("",@lines);
+	
+		# slash in name means it's a phone specific build file: add LIBs
+		my $libs2 = ""; # output
+		$libs2 .= "$libs$libZ" if ($name =~ /\//);
+
+		$onestr =~ s/$a.*$b/$a$updated$macros2$libs2$b/s;
+		
+		open FILE, ">$file";
+		print FILE $onestr;
+		close FILE;
+
+		my $count = @lines;
+		print "wrote $count lines.\n";
+	}
+}		
+
+##################################################################################################################