[Scummvm-cvs-logs] SF.net SVN: scummvm: [22341] scummvm/trunk/backends/symbian/src

[anotherguest at users.sourceforge.net]

Revision: 22341
Author:   anotherguest
Date:     2006-05-04 13:47:27 -0700 (Thu, 04 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22341&view=rev

Log Message:
-----------
Updates for S60V3 and UIQ3

Modified Paths:
--------------
    scummvm/trunk/backends/symbian/S60v3/ScummVM_S60v3.mmp.in
    scummvm/trunk/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
    scummvm/trunk/backends/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
    scummvm/trunk/backends/symbian/src/ScummApp.cpp
    scummvm/trunk/backends/symbian/src/ScummApp.h
Modified: scummvm/trunk/backends/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/trunk/backends/symbian/S60v3/ScummVM_S60v3.mmp.in	2006-05-04 13:59:40 UTC (rev 22340)
+++ scummvm/trunk/backends/symbian/S60v3/ScummVM_S60v3.mmp.in	2006-05-04 20:47:27 UTC (rev 22341)
@@ -66,6 +66,7 @@
 EPOCHEAPSIZE	2048000	16192000
 
 MACRO			S60
+MACRO			S60V3
 MACRO			EPOC_AS_APP
 //START_AUTO_MACROS_SLAVE//
 

Modified: scummvm/trunk/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
===================================================================
--- scummvm/trunk/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg	2006-05-04 13:59:40 UTC (rev 22340)
+++ scummvm/trunk/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg	2006-05-04 20:47:27 UTC (rev 22341)
@@ -23,10 +23,10 @@
 "\s60v3\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"C:\shared\ScummVM\scummvm.ini",FILENULL
-""-"C:\shared\ScummVM\scummvm.stdout.txt",FILENULL
-""-"C:\shared\ScummVM\scummvm.stderr.txt",FILENULL
-""-"C:\shared\ScummVM\sdl.ini",FILENULL
+""-"c:\private\A0000657\scummvm.ini",FILENULL
+""-"c:\private\A0000657\scummvm.stdout.txt",FILENULL
+""-"c:\private\A0000657\scummvm.stderr.txt",FILENULL
+""-"c:\private\A0000657\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
 ; It will remove the config file, std***.txt files & dirs on uninstall.
\ No newline at end of file

Modified: scummvm/trunk/backends/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
===================================================================
--- scummvm/trunk/backends/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg	2006-05-04 13:59:40 UTC (rev 22340)
+++ scummvm/trunk/backends/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg	2006-05-04 20:47:27 UTC (rev 22341)
@@ -24,10 +24,10 @@
 "\uiq3\epoc32\data\z\private\10003a3f\apps\scummvm_reg.rsc"-"!:\private\10003a3f\import\apps\scummvm_reg.rsc"
 
 ; Config/log files: 'empty' will automagically be removed on uninstall
-""-"d:\shared\ScummVM\scummvm.ini",FILENULL
-""-"d:\shared\ScummVM\scummvm.stdout.txt",FILENULL
-""-"d:\shared\ScummVM\scummvm.stderr.txt",FILENULL
-""-"d:\shared\ScummVM\sdl.ini",FILENULL
+""-"c:\private\A0000657\scummvm.ini",FILENULL
+""-"c:\private\A0000657\scummvm.stdout.txt",FILENULL
+""-"c:\private\A0000657\scummvm.stderr.txt",FILENULL
+""-"c:\private\A0000657\sdl.ini",FILENULL
 
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
 ; It will remove the config file, std***.txt files & dirs on uninstall.
\ No newline at end of file

Modified: scummvm/trunk/backends/symbian/src/ScummApp.cpp
===================================================================
--- scummvm/trunk/backends/symbian/src/ScummApp.cpp	2006-05-04 13:59:40 UTC (rev 22340)
+++ scummvm/trunk/backends/symbian/src/ScummApp.cpp	2006-05-04 20:47:27 UTC (rev 22341)
@@ -73,7 +73,7 @@
 	return new CScummApp;
 }
 
-#if defined (UIQ3) || defined (__SERIES60_30__)
+#if defined (UIQ3) || defined (S60V3)
 #include <eikstart.h>
 // E32Main() contains the program's start up code, the entry point for an EXE.
 GLDEF_C TInt E32Main() {
@@ -83,7 +83,7 @@
 
 #endif // EPOC_AS_APP
 
-#if !defined (UIQ3) && !defined (__SERIES60_30__)
+#if !defined (UIQ3) && !defined (S60V3)
 GLDEF_C  TInt E32Dll(TDllReason) {
 	return KErrNone;
 }

Modified: scummvm/trunk/backends/symbian/src/ScummApp.h
===================================================================
--- scummvm/trunk/backends/symbian/src/ScummApp.h	2006-05-04 13:59:40 UTC (rev 22340)
+++ scummvm/trunk/backends/symbian/src/ScummApp.h	2006-05-04 20:47:27 UTC (rev 22341)
@@ -29,7 +29,7 @@
 #include <e32base.h>
 #include <sdlapp.h>
 
-#if defined (EPOC_AS_APP) && !defined (UIQ3) && !(__SERIES60_30__)
+#if defined (EPOC_AS_APP) && !defined (UIQ3) && !defined (S60V3)
 #include "ECompXL.h"
 #endif
 
@@ -39,7 +39,7 @@
 	~CScummApp();
 
 	TUid AppDllUid() const;
-#if defined (EPOC_AS_APP) && !defined (UIQ3) && !(__SERIES60_30__)
+#if defined (EPOC_AS_APP) && !defined (UIQ3) && !defined (S60V3)
 	TECompXL    iECompXL;
 #endif
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.