[Scummvm-cvs-logs] SF.net SVN: scummvm: [23895] scummvm/trunk/backends/platform/symbian
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Sat Sep 16 21:51:13 CEST 2006
Revision: 23895
http://svn.sourceforge.net/scummvm/?rev=23895&view=rev
Author: anotherguest
Date: 2006-09-16 12:50:41 -0700 (Sat, 16 Sep 2006)
Log Message:
-----------
* Updated Symbian project files for new file structure
Modified Paths:
--------------
scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in
scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in
scummvm/trunk/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in
scummvm/trunk/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
scummvm/trunk/backends/platform/symbian/mmp/scummvm_agi.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_cine.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_gob.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_lure.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_queen.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_simon.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_sky.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
scummvm/trunk/backends/platform/symbian/src/portdefs.h
Modified: scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
===================================================================
--- scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl 2006-09-16 19:50:41 UTC (rev 23895)
@@ -2,7 +2,7 @@
use Cwd;
$buildDir = getcwd();
-chdir("../../");
+chdir("../../../");
# list of project files to process
@mmp_files = (
Modified: scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -60,8 +60,8 @@
// *** Include paths
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE ..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
SYSTEMINCLUDE \epoc32\include\ESDL
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -71,7 +71,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
//START_AUTO_OBJECTS_BASE_//
@@ -82,13 +82,13 @@
SOURCEPATH ..\..\..
// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+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\symbian\src\SymbianOS.cpp
-SOURCE backends\symbian\src\SymbianActions.cpp
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
+SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
Modified: scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg 2006-09-16 19:50:41 UTC (rev 23895)
@@ -6,7 +6,7 @@
;&EN
; UID is the app's UID
-#{"ScummVM S60v1"},(0x101f9b57),0,80,0
+#{"ScummVM S60v1"},(0x101f9b57),0,90,0
; Platform type
(0x101F6F88), 0, 0, 0, {"Series60ProductID"}
Modified: scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -64,7 +64,7 @@
EPOCSTACKSIZE 0x0000F000
EPOCHEAPSIZE 2048000 16192000
-
+ALWAYS_BUILD_AS_ARM
MACRO S60
MACRO S60V3
MACRO EPOC_AS_APP
@@ -80,8 +80,8 @@
// *** Include paths
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE ..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
SYSTEMINCLUDE \epoc32\include\ESDL
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -91,7 +91,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
//START_AUTO_OBJECTS_BASE_//
@@ -102,13 +102,13 @@
SOURCEPATH ..\..\..
// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+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\symbian\src\SymbianOS.cpp
-SOURCE backends\symbian\src\SymbianActions.cpp
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
+SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
Modified: scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg 2006-09-16 19:50:41 UTC (rev 23895)
@@ -16,6 +16,7 @@
;Supports Series 60 v 3.0
[0x101F7961], 0, 0, 0, {"Series60ProductID"}
+*"..\res\scummvm.key","..\res\scummvm.cer",KEY="scummvm"
; Launcher, Application, AIF & Resource file
"\s60v3\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe"
"\s60v3\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc"
Modified: scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -58,8 +58,8 @@
// *** Include paths
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE ..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
SYSTEMINCLUDE \epoc32\include\ESDL
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -69,7 +69,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
//START_AUTO_OBJECTS_BASE_//
@@ -80,13 +80,13 @@
SOURCEPATH ..\..\..
// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+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\symbian\src\SymbianOS.cpp
-SOURCE backends\symbian\src\SymbianActions.cpp
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
+SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
Modified: scummvm/trunk/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg 2006-09-16 19:50:41 UTC (rev 23895)
@@ -6,7 +6,7 @@
;&EN
; UID is the app's UID
-#{"ScummVM S80"},(0x101f9b57),0,80,3
+#{"ScummVM S80"},(0x101f9b57),0,90,0
; Platform type -- disabled: seems to be causing trouble
;(0x101F8ED2), 0, 0, 0, {"Series80ProductID"}
Modified: scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -58,8 +58,8 @@
// *** Include paths
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE ..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
SYSTEMINCLUDE \epoc32\include\ESDL
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -69,7 +69,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
//START_AUTO_OBJECTS_BASE_//
@@ -80,13 +80,13 @@
SOURCEPATH ..\..\..
// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+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\symbian\src\SymbianOS.cpp
-SOURCE backends\symbian\src\SymbianActions.cpp
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
+SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
Modified: scummvm/trunk/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg 2006-09-16 19:50:41 UTC (rev 23895)
@@ -6,7 +6,7 @@
;&EN
; UID is the app's UID
-#{"ScummVM S90"},(0x101f9b57),0,80,3
+#{"ScummVM S90"},(0x101f9b57),0,90,0
; Platform type -- disabled: seems to be causing trouble
;(0x101FBE04), 0, 0, 0, {"Series90ProductID"}
Modified: scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/UIQ2/ScummVM_UIQ2.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -57,8 +57,8 @@
// *** Include paths
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE ..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
SYSTEMINCLUDE \epoc32\include\ESDL
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -68,7 +68,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
//START_AUTO_OBJECTS_BASE_//
@@ -76,16 +76,16 @@
//STOP_AUTO_OBJECTS_BASE_//
-SOURCEPATH ..\..\..\
+SOURCEPATH ..\..\..\..\
// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+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\symbian\src\SymbianOS.cpp
-SOURCE backends\symbian\src\SymbianActions.cpp
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
+SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
Modified: scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg 2006-09-16 19:50:41 UTC (rev 23895)
@@ -6,7 +6,7 @@
;&EN
; UID is the app's UID
-#{"ScummVM UIQ2"},(0x101f9b57),0,80,3
+#{"ScummVM UIQ2"},(0x101f9b57),0,90,0
; Platform type
(0x101F617B), 2, 0, 0, {"UIQ20ProductID"}
Modified: scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -67,6 +67,7 @@
MACRO UIQ
MACRO UIQ3
MACRO EPOC_AS_APP
+ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
@@ -80,8 +81,8 @@
// *** Include paths
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\engines
-USERINCLUDE ..\..\..\backends\fs ..\src ..\..\..\backends\sdl ..\..\..\sound
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\engines
+USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl ..\..\..\..\sound
SYSTEMINCLUDE \epoc32\include\ESDL
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -91,7 +92,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\base
+SOURCEPATH ..\..\..\..\base
//START_AUTO_OBJECTS_BASE_//
@@ -99,16 +100,16 @@
//STOP_AUTO_OBJECTS_BASE_//
-SOURCEPATH ..\..\..\
+SOURCEPATH ..\..\..\..\
// backend EPOC/SDL/ESDL specific includes
-SOURCE backends\sdl\events.cpp
-SOURCE backends\sdl\graphics.cpp
-SOURCE backends\sdl\sdl.cpp
+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\symbian\src\SymbianOS.cpp
-SOURCE backends\symbian\src\SymbianActions.cpp
-SOURCE backends\symbian\src\ScummApp.cpp
+SOURCE backends\platform\symbian\src\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
+SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE gui\Key.cpp
SOURCE gui\KeysDialog.cpp
Modified: scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg 2006-09-16 19:50:41 UTC (rev 23895)
@@ -16,6 +16,8 @@
; Product/platform version UID, Major, Minor, Build, Product ID
(0x101F6300), 3, 0, 0, {"UIQ30ProductID"}
+
+*"..\res\scummvm.key","..\res\scummvm.cer",KEY="scummvm"
; Application, AIF & Resource file
"\uiq3\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe"
"\uiq3\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc"
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_agi.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_agi.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_agi.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\agi
+SOURCEPATH ..\..\..\..\engines\agi
//START_AUTO_OBJECTS_AGI_//
@@ -49,7 +49,7 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -54,14 +54,14 @@
//MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib
//MACRO DISABLE_LURE // LIB:scummvm_lure.lib
//MACRO DISABLE_CINE // LIB:scummvm_cine.lib
- //MACRO DISABLE_AGI // LIB:scummvm_cine.lib
+ //MACRO DISABLE_AGI // LIB:scummvm_agi.lib
//STOP_AUTO_MACROS_MASTER//
// *** Include paths
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound
-USERINCLUDE ..\..\..\backends\fs ..\src ..\..\..\backends\sdl
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound
+USERINCLUDE ..\..\..\..\backends\fs ..\src ..\..\..\..\backends\platform\sdl
SYSTEMINCLUDE \epoc32\include\ESDL
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
@@ -72,21 +72,21 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\common
+SOURCEPATH ..\..\..\..\common
//START_AUTO_OBJECTS_COMMON_//
// empty base file, will be updated by Perl build scripts
//STOP_AUTO_OBJECTS_COMMON_//
-SOURCEPATH ..\..\..\graphics
+SOURCEPATH ..\..\..\..\graphics
//START_AUTO_OBJECTS_GRAPHICS_//
// empty base file, will be updated by Perl build scripts
//STOP_AUTO_OBJECTS_GRAPHICS_//
-SOURCEPATH ..\..\..\gui
+SOURCEPATH ..\..\..\..\gui
//START_AUTO_OBJECTS_GUI_//
// empty base file, will be updated by Perl build scripts
@@ -98,14 +98,16 @@
//SOURCE KeysDialog.cpp
//SOURCE Actions.cpp
-SOURCEPATH ..\..\..\sound
+SOURCEPATH ..\..\..\..\sound
//START_AUTO_OBJECTS_SOUND_//
// empty base file, will be updated by Perl build scripts
//STOP_AUTO_OBJECTS_SOUND_//
-sourcepath ..\..\..
+sourcepath ..\..\..\..
+source backends\timer\default\default-timer.cpp
+source backends\saves\savefile.cpp
+source backends\saves\default\default-saves.cpp
// backend specific includes
-SOURCE backends\fs\fs.cpp
// backend specific includes
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_cine.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_cine.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_cine.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\cine
+SOURCEPATH ..\..\..\..\engines\cine
//START_AUTO_OBJECTS_CINE_//
@@ -49,6 +49,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_gob.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_gob.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_gob.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\gob
+SOURCEPATH ..\..\..\..\engines\gob
//START_AUTO_OBJECTS_GOB_//
@@ -49,6 +49,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_kyra.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_kyra.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\kyra
+SOURCEPATH ..\..\..\..\engines\kyra
//START_AUTO_OBJECTS_KYRA_//
@@ -49,6 +49,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_lure.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_lure.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_lure.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\lure
+SOURCEPATH ..\..\..\..\engines\lure
//START_AUTO_OBJECTS_LURE_//
@@ -49,6 +49,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_queen.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_queen.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_queen.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\queen
+SOURCEPATH ..\..\..\..\engines\queen
//START_AUTO_OBJECTS_QUEEN_//
@@ -49,6 +49,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\saga
+SOURCEPATH ..\..\..\..\engines\saga
//START_AUTO_OBJECTS_SAGA_//
@@ -49,6 +49,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\scumm
+SOURCEPATH ..\..\..\..\engines\scumm
//START_AUTO_OBJECTS_SCUMM_//
@@ -61,8 +61,8 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines ..\..\..\engines\scumm\smush ..\..\..\engines\scumm\insane
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines ..\..\..\..\engines\scumm\smush ..\..\..\..\engines\scumm\insane
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_simon.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_simon.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_simon.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\simon
+SOURCEPATH ..\..\..\..\engines\simon
//START_AUTO_OBJECTS_SIMON_//
@@ -49,7 +49,7 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_sky.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_sky.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_sky.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\sky
+SOURCEPATH ..\..\..\..\engines\sky
//START_AUTO_OBJECTS_SKY_//
@@ -49,6 +49,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines ..\..\..\engines\sky\music
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines ..\..\..\..\engines\sky\music
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword1.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword1.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\sword1
+SOURCEPATH ..\..\..\..\engines\sword1
//START_AUTO_OBJECTS_SWORD1_//
@@ -49,6 +49,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword2.mmp.in 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword2.mmp.in 2006-09-16 19:50:41 UTC (rev 23895)
@@ -39,7 +39,7 @@
// *** SOURCE files
-SOURCEPATH ..\..\..\engines\sword2
+SOURCEPATH ..\..\..\..\engines\sword2
//START_AUTO_OBJECTS_SWORD2_//
@@ -49,6 +49,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\engines
-USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src
+USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianActions.cpp 2006-09-16 19:50:41 UTC (rev 23895)
@@ -128,6 +128,7 @@
bool is_gob = (strncmp(gameid.c_str(), "gob", 3) == 0);
bool is_ite = ((strncmp(gameid.c_str(), "ite", 3) == 0) ||
(strncmp(gameid.c_str(), "ihnm", 4) == 0));
+ bool is_kyra = (gameid == "kyra1");
Actions::initInstanceGame();
@@ -137,7 +138,7 @@
// Initialize keys for different actions
// Save
- if (is_simon || is_gob)
+ if (is_simon || is_gob || is_kyra)
_action_enabled[ACTION_SAVE] = false;
else if (is_queen || is_ite) {
_action_enabled[ACTION_SAVE] = true;
Modified: scummvm/trunk/backends/platform/symbian/src/portdefs.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/portdefs.h 2006-09-16 19:31:23 UTC (rev 23894)
+++ scummvm/trunk/backends/platform/symbian/src/portdefs.h 2006-09-16 19:50:41 UTC (rev 23895)
@@ -21,7 +21,8 @@
* $URL$
* $Id$
*/
-
+#ifndef SYMBIAN_PORTDEFS_H
+#define SYMBIAN_PORTDEFS_H
#include <assert.h>
#include <stdarg.h>
#include <string.h>
@@ -122,6 +123,9 @@
#define snprintf scumm_snprintf
#define vsnprintf scumm_vsnprintf
+ void* symbian_malloc (size_t _size);
+
+ #define malloc symbian_malloc
#else // GCCE and the rest
#define snprintf(buf,len,args...) sprintf(buf,args)
#define vsnprintf(buf,len,format,valist) vsprintf(buf,format,valist)
@@ -146,3 +150,4 @@
extern void FatalError(const char *msg);
extern char* GetExecutablePath();
}
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list