[Scummvm-cvs-logs] CVS: scummvm/backends/epoc/build/UIQ BLD.INF,1.2,1.3 EScummVM_080.pkg,1.1,1.2 EScummVM_UIQ.mmp,1.3,1.4

[Lars Persson]

Update of /cvsroot/scummvm/scummvm/backends/epoc/build/UIQ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27621/backends/epoc/build/UIQ

Modified Files:
	BLD.INF EScummVM_080.pkg EScummVM_UIQ.mmp 
Log Message:
Updated symbian actions and build scripts.  Run updateMMPs to updated all MMPS based on the base mmp

Index: BLD.INF
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/UIQ/BLD.INF,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BLD.INF	9 Jul 2005 23:25:44 -0000	1.2
+++ BLD.INF	30 Sep 2005 11:57:36 -0000	1.3
@@ -2,6 +2,10 @@
 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

Index: EScummVM_080.pkg
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/UIQ/EScummVM_080.pkg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EScummVM_080.pkg	21 Jun 2005 20:19:39 -0000	1.1
+++ EScummVM_080.pkg	30 Sep 2005 11:57:36 -0000	1.2
@@ -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

Index: EScummVM_UIQ.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/UIQ/EScummVM_UIQ.mmp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- EScummVM_UIQ.mmp	9 Jul 2005 23:25:44 -0000	1.3
+++ EScummVM_UIQ.mmp	30 Sep 2005 11:57:36 -0000	1.4
@@ -36,37 +36,34 @@
 
 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
 
-// *** Static Libraries
+// 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//
 
-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
+// *** Static Libraries
 
-STATICLIBRARY libmad.lib
-STATICLIBRARY zlib.lib
 STATICLIBRARY esdl.lib
 #if !defined(WINS)
 STATICLIBRARY egcc.lib // for __fixunsdfsi