Updates for S60V3 and UIQ3

svn-id: r22341

5 files changed, 13 insertions, 12 deletions

diff --git a/backends/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/symbian/S60v3/ScummVM_S60v3.mmp.in
index 2b84db43a6..545eade06e 100644
--- a/backends/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -66,6 +66,7 @@ EPOCSTACKSIZE	0x0000F000
 EPOCHEAPSIZE	2048000	16192000
 
 MACRO			S60
+MACRO			S60V3
 MACRO			EPOC_AS_APP
 //START_AUTO_MACROS_SLAVE//
 
diff --git a/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index 7cdf422163..71abb9d48e 100644
--- a/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -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
diff --git a/backends/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index adadf9fee5..3a47591b0a 100644
--- a/backends/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -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
diff --git a/backends/symbian/src/ScummApp.cpp b/backends/symbian/src/ScummApp.cpp
index 71cbb33887..f750e496fa 100644
--- a/backends/symbian/src/ScummApp.cpp
+++ b/backends/symbian/src/ScummApp.cpp
@@ -73,7 +73,7 @@ CApaApplication* NewApplication() {
 	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 @@ GLDEF_C TInt E32Main() {
 
 #endif // EPOC_AS_APP
 
-#if !defined (UIQ3) && !defined (__SERIES60_30__)
+#if !defined (UIQ3) && !defined (S60V3)
 GLDEF_C  TInt E32Dll(TDllReason) {
 	return KErrNone;
 }
diff --git a/backends/symbian/src/ScummApp.h b/backends/symbian/src/ScummApp.h
index 56ca8b68c3..9b8fd47a1d 100644
--- a/backends/symbian/src/ScummApp.h
+++ b/backends/symbian/src/ScummApp.h
@@ -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 @@ public:
 	~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
 };