Updated version number in installation files

svn-id: r29126

9 files changed, 28 insertions, 18 deletions

diff --git a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
index d15f549207..ddd15c665e 100644
--- a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
+++ b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
@@ -28,7 +28,7 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S60v1"},(0x101f9b57),0,100,0
+#{"ScummVM S60v1"},(0x101f9b57),0,110,0
 
 ; Platform type
 (0x101F6F88), 0, 0, 0, {"Series60ProductID"}
diff --git a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg
index 5e0c8bfdaa..b3bc3cae54 100644
--- a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg
+++ b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg
@@ -6,7 +6,7 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S60v2"},(0x101f9b57),0,100,0
+#{"ScummVM S60v2"},(0x101f9b57),0,110,0
 
 ; Platform type
 (0x101F6F88), 0, 0, 0, {"Series60ProductID"}
diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
index 4ba5d43bcd..2d3103c41c 100644
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -28,7 +28,7 @@
 
 TARGET          ScummVM.exe
 TARGETPATH      sys\bin
-TARGETTYPE      EXE
+TARGETTYPE      exe
 
 UID             0x100039ce 0xA0000657 
 
@@ -48,6 +48,9 @@ TARGETPATH              \Resource\Apps
 LANG                    SC
 END
 
+EPOCSTACKSIZE	80000 
+EPOCHEAPSIZE	3000000 32000000
+
 START BITMAP    ScummVM.mbm
 TARGETPATH              \Resource\Apps
 SOURCEPATH              ..\res
@@ -62,12 +65,11 @@ SOURCE  c24             ScummxLarge.bmp
 SOURCE  8               ScummxLargeMask.bmp
 END
 
-EPOCSTACKSIZE	80000
-EPOCHEAPSIZE	2048000	32000000
-ALWAYS_BUILD_AS_ARM
 MACRO			S60
 MACRO			S60V3
 
+ALWAYS_BUILD_AS_ARM
+
 //START_AUTO_MACROS_SLAVE//
 
 	// empty base file, will be updated by Perl build scripts
@@ -78,6 +80,10 @@ MACRO			S60V3
 
 STATICLIBRARY esdl.lib
 
+#if !defined(WINS)
+staticlibrary rate_arm_asm.o codec47ARM.o gfxARM.o
+#endif
+
 // *** Include paths
 
 USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
@@ -105,7 +111,7 @@ SOURCEPATH ..\..\..\..
 SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
-SOURCE backends\fs\symbian\symbian-fs.cpp
+SOURCE backends\fs\abstract-fs-factory.cpp
 SOURCE backends\platform\symbian\src\SymbianOS.cpp 
 SOURCE backends\platform\symbian\src\SymbianActions.cpp 
 SOURCE backends\platform\symbian\src\ScummApp.cpp
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index 12d5b37be2..f442ab1a96 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -34,7 +34,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),0,100,0
+#{"ScummVM S60v3"},(0xA0000657),0,110,0
 
 ;Supports Series 60 v 3.0
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
diff --git a/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg b/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
index db94745b35..5b696822ce 100644
--- a/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
+++ b/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
@@ -28,7 +28,7 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S80"},(0x101f9b57),0,100,0
+#{"ScummVM S80"},(0x101f9b57),0,110,0
 
 ; Platform type -- disabled: seems to be causing trouble
 ;(0x101F8ED2), 0, 0, 0, {"Series80ProductID"}
diff --git a/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg b/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
index 6752bc3813..21fbbce4d1 100644
--- a/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
+++ b/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
@@ -28,7 +28,7 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM S90"},(0x101f9b57),0,100,0
+#{"ScummVM S90"},(0x101f9b57),0,110,0
 
 ; Platform type -- disabled: seems to be causing trouble
 ;(0x101FBE04), 0, 0, 0, {"Series90ProductID"}
diff --git a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg
index 8783f25337..ecca51bd26 100644
--- a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg
+++ b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg
@@ -6,7 +6,7 @@
 ;&EN
 
 ; UID is the app's UID
-#{"ScummVM SE"},(0x101f9b57),0,100,0
+#{"ScummVM SE"},(0x101f9b57),0,110,0
 
 ; Platform type
 (0x101F617B), 2, 0, 0, {"UIQ20ProductID"}
diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
index e6ba0ea743..3fcecdac75 100644
--- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
+++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
@@ -26,10 +26,12 @@
 
 // *** Definitions
 
-TARGET          SCUMMVM.exe
-//TARGETPATH      sys\bin
+TARGET          ScummVM.exe
+TARGETPATH      sys\bin
 TARGETTYPE      exe
 						
+UID             0x100039ce 0xA0000657 
+
 START RESOURCE  ScummVM_reg.rss
 TARGETPATH              \private\10003a3f\apps
 END
@@ -62,7 +64,6 @@ SOURCE  8               ScummLargeMask.bmp
 SOURCE  c24             ScummxLarge.bmp
 SOURCE  8               ScummxLargeMask.bmp
 END
-UID             0x100039ce 0xA0000657 
 
 MACRO			UIQ
 MACRO			UIQ3
@@ -79,6 +80,10 @@ ALWAYS_BUILD_AS_ARM
 
 STATICLIBRARY esdl.lib
 
+#if !defined(WINS)
+staticlibrary rate_arm_asm.o codec47ARM.o gfxARM.o
+#endif
+
 // *** Include paths
 
 USERINCLUDE	    ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
@@ -106,7 +111,7 @@ SOURCEPATH ..\..\..\..\
 SOURCE backends\platform\sdl\events.cpp
 SOURCE backends\platform\sdl\graphics.cpp
 SOURCE backends\platform\sdl\sdl.cpp
-SOURCE backends\fs\symbian\symbian-fs.cpp
+SOURCE backends\fs\abstract-fs-factory.cpp
 SOURCE backends\platform\symbian\src\SymbianOS.cpp 
 SOURCE backends\platform\symbian\src\SymbianActions.cpp 
 SOURCE backends\platform\symbian\src\ScummApp.cpp
@@ -119,7 +124,6 @@ SOURCE gui\Actions.cpp
 source graphics\iff.cpp
 
 // *** Dynamic Libraries
-
 LIBRARY cone.lib  eikcore.lib 
 LIBRARY euser.lib apparc.lib fbscli.lib  
 LIBRARY estlib.lib apgrfx.lib
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index f92b013cd7..7430fb703f 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -32,7 +32,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM UIQ3"},(0xA0000657),0,100,0
+#{"ScummVM UIQ3"},(0xA0000657),0,110,0
 
 ; ProductID for UIQ 3.0
 ; Product/platform version UID, Major, Minor, Build, Product ID