[Scummvm-cvs-logs] CVS: scummvm/backends/epoc/build/S60 EScummVM_080.pkg,1.1,1.2 EScummVM_S60_EXE.mmp,1.2,1.3

[Lars Persson]

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

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

Index: EScummVM_080.pkg
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/S60/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,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

Index: EScummVM_S60_EXE.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/S60/EScummVM_S60_EXE.mmp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EScummVM_S60_EXE.mmp	9 Jul 2005 23:25:44 -0000	1.2
+++ EScummVM_S60_EXE.mmp	30 Sep 2005 11:57:36 -0000	1.3
@@ -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
 
-// *** 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_exe.lib
 #if !defined(WINS)
 STATICLIBRARY egcc.lib // for __fixunsdfsi
 #endif
+
 // *** Include paths
 
 USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui
@@ -108,6 +104,7 @@
 SOURCE gui\Key.cpp
 SOURCE gui\KeysDialog.cpp
 SOURCE gui\Actions.cpp
+
 // *** Dynamic Libraries
 
 LIBRARY cone.lib  eikcore.lib 
@@ -115,5 +112,4 @@
 LIBRARY estlib.lib apgrfx.lib
 LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
-LIBRARY AVKON.LIB