[Scummvm-cvs-logs] CVS: scummvm/backends/epoc/build/S60 BLD.INF,1.3,1.3.2.1 EScummVM_S60_EXE.mmp,1.5.2.1,1.5.2.2 ScummVMApp.cpp,1.3.2.1,1.3.2.2

[Lars Persson]

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

Modified Files:
      Tag: branch-0-8-0
	BLD.INF EScummVM_S60_EXE.mmp ScummVMApp.cpp 
Log Message:
Updated S60/Symbian build files

Index: BLD.INF
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/S60/BLD.INF,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- BLD.INF	9 Jul 2005 23:25:44 -0000	1.3
+++ BLD.INF	20 Oct 2005 20:11:06 -0000	1.3.2.1
@@ -9,6 +9,5 @@
 ..\scummvm_queen.mmp
 ..\scummvm_gob.mmp
 ..\scummvm_saga.mmp
-.\EScummVM_S60.mmp
 .\EScummVM_S60_App.mmp
 .\EScummVM_S60_Exe.mmp

Index: EScummVM_S60_EXE.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/S60/EScummVM_S60_EXE.mmp,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- EScummVM_S60_EXE.mmp	18 Oct 2005 02:11:15 -0000	1.5.2.1
+++ EScummVM_S60_EXE.mmp	20 Oct 2005 20:11:06 -0000	1.5.2.2
@@ -38,8 +38,10 @@
 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
 
+#if !defined(WINS)
 EPOCSTACKSIZE	0x00008000
-EPOCHEAPSIZE	1024	8192000
+EPOCHEAPSIZE	2048000	8192000
+#endif
 
 MACRO			S60
 
@@ -109,7 +111,7 @@
 
 LIBRARY cone.lib  eikcore.lib 
 LIBRARY euser.lib apparc.lib fbscli.lib  
-LIBRARY estlib.lib apgrfx.lib
+LIBRARY estlib.lib 
 LIBRARY gdi.lib hal.lib bitgdi.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
 library avkon.lib

Index: ScummVMApp.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/S60/ScummVMApp.cpp,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- ScummVMApp.cpp	18 Oct 2005 02:11:15 -0000	1.3.2.1
+++ ScummVMApp.cpp	20 Oct 2005 20:11:06 -0000	1.3.2.2
@@ -77,11 +77,15 @@
 
 void CScummVMUi::ConstructL() {
 	BaseConstructL();
+	TApaTaskList taskList(iEikonEnv->WsSession());
+	TApaTask myTask=taskList.FindApp(TUid::Uid(0x101f9b57));
+	myTask.SendToBackground();
+
 	TBuf<128> startFile;
 	startFile = iEikonEnv->EikAppUi()->Application()->AppFullName();
 	TParse parser;
 	parser.Set(startFile,NULL,NULL);
-
+	
 	startFile = parser.DriveAndPath();
 #ifndef __WINS__
 	startFile.Append( _L("EScummVM.exe"));
@@ -96,10 +100,6 @@
 	CleanupStack::PopAndDestroy();//close lsSession
 	CleanupStack::PopAndDestroy(cmdLine);
 	User::After(500000);// Let the application start
-
-	TApaTaskList taskList(iEikonEnv->WsSession());
-	TApaTask myTask=taskList.FindApp(TUid::Uid(0x101f9b57));
-	myTask.SendToBackground();
 	TApaTask exeTask=taskList.FindByPos(0);
 	iExeWgId=exeTask.WgId();