[Scummvm-cvs-logs] SF.net SVN: scummvm: [30705] scummvm/branches/branch-0-11-0
Anotherguest at users.sourceforge.net
Anotherguest at users.sourceforge.net
Tue Jan 29 22:32:42 CET 2008
Revision: 30705
http://scummvm.svn.sourceforge.net/scummvm/?rev=30705&view=rev
Author: Anotherguest
Date: 2008-01-29 13:32:42 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
- - Fix for GOB3 scrolling problem in Symbian
- Fix for exist in Symbian FS
- Fix in Symbian Makefiles (flags and max heap size)
- Updated features list for new engines
Modified Paths:
--------------
scummvm/branches/branch-0-11-0/backends/fs/symbian/symbian-fs.cpp
scummvm/branches/branch-0-11-0/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
scummvm/branches/branch-0-11-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_agi.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_agos.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_base.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_cine.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_gob.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_igor.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_lure.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_queen.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_saga.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sky.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_touche.mmp.in
scummvm/branches/branch-0-11-0/backends/platform/symbian/src/SymbianOS.cpp
scummvm/branches/branch-0-11-0/backends/platform/symbian/src/main_features.inl
scummvm/branches/branch-0-11-0/engines/gob/util.cpp
Modified: scummvm/branches/branch-0-11-0/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/backends/fs/symbian/symbian-fs.cpp 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/fs/symbian/symbian-fs.cpp 2008-01-29 21:32:42 UTC (rev 30705)
@@ -58,13 +58,19 @@
*/
SymbianFilesystemNode(const String &path);
- virtual bool exists() const { return true; } //FIXME: this is just a stub
+ virtual bool exists() const {
+ TFileName fname;
+ TPtrC8 ptr((const unsigned char*)_path.c_str(),_path.size());
+ fname.Copy(ptr);
+ TBool fileExists = BaflUtils::FileExists(CEikonEnv::Static()->FsSession(), fname);
+ return fileExists;
+ }
virtual String getDisplayName() const { return _displayName; }
virtual String getName() const { return _displayName; }
virtual String getPath() const { return _path; }
virtual bool isDirectory() const { return _isDirectory; }
- virtual bool isReadable() const { return true; } //FIXME: this is just a stub
- virtual bool isWritable() const { return true; } //FIXME: this is just a stub
+ virtual bool isReadable() const { return access(_path.c_str(), R_OK) == 0; } //FIXME: this is just a stub
+ virtual bool isWritable() const { return access(_path.c_str(), W_OK) == 0; } //FIXME: this is just a stub
virtual AbstractFilesystemNode *getChild(const String &n) const;
virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl 2008-01-29 21:32:42 UTC (rev 30705)
@@ -14,7 +14,7 @@
MACRO DISABLE_PARALLACTION // LIB:scummvm_parallaction.lib
MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
MACRO DISABLE_DRASCULA // LIB:scummvm_drascula.lib
- MACRO DISABLE_IGOR // LIB:scummvm_igor.lib
+ MACRO DISABLE_IGOR // LIB:scummvm_igor.lib
";
##
@@ -364,7 +364,7 @@
# //MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
# $DefaultBottomMacros";
- $SDK_Variations{'ALL'}{'test_lure'} = "$DefaultTopMacros
+ $SDK_Variations{'ALL'}{'lure'} = "$DefaultTopMacros
MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
MACRO DISABLE_SKY // LIB:scummvm_sky.lib
@@ -395,7 +395,7 @@
MACRO DISABLE_IGOR // LIB:scummvm_igor.lib
$DefaultBottomMacros";
- $SDK_Variations{'ALL'}{'test_agi'} = "$DefaultTopMacros
+ $SDK_Variations{'ALL'}{'agi'} = "$DefaultTopMacros
MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
MACRO DISABLE_SKY // LIB:scummvm_sky.lib
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -29,8 +29,9 @@
TARGET ScummVM.exe
TARGETPATH sys\bin
TARGETTYPE exe
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
-UID 0x100039ce 0xA0000657
+UID 0x100039ce 0xA0000657
START RESOURCE ScummVM_reg.rss
TARGETPATH \private\10003a3f\apps
@@ -41,15 +42,15 @@
LANG SC
END
-SOURCEPATH ..\res
+SOURCEPATH ..\res
START RESOURCE ScummVM.rss
HEADER
TARGETPATH \Resource\Apps
LANG SC
END
-EPOCSTACKSIZE 80000
-EPOCHEAPSIZE 3000000 32000000
+EPOCSTACKSIZE 80000
+EPOCHEAPSIZE 3000000 64000000
START BITMAP ScummVM.mbm
TARGETPATH \Resource\Apps
@@ -89,9 +90,9 @@
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
-SYSTEMINCLUDE \epoc32\include\libc
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
@@ -112,8 +113,8 @@
SOURCE backends\platform\sdl\graphics.cpp
SOURCE backends\platform\sdl\sdl.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\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE gui\Key.cpp
@@ -124,8 +125,8 @@
source graphics\iff.cpp
// *** Dynamic Libraries
-LIBRARY cone.lib eikcore.lib
-LIBRARY euser.lib apparc.lib fbscli.lib
+LIBRARY cone.lib eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
LIBRARY estlib.lib apgrfx.lib
LIBRARY gdi.lib hal.lib bitgdi.lib
LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -29,9 +29,11 @@
TARGET ScummVM.exe
TARGETPATH sys\bin
TARGETTYPE exe
-
-UID 0x100039ce 0xA0000657
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
+
+UID 0x100039ce 0xA0000657
+
START RESOURCE ScummVM_reg.rss
TARGETPATH \private\10003a3f\apps
END
@@ -41,15 +43,15 @@
LANG SC
END
-SOURCEPATH .
+SOURCEPATH .
START RESOURCE ScummVM.rss
HEADER
TARGETPATH \Resource\Apps
LANG SC
END
-EPOCSTACKSIZE 80000
-EPOCHEAPSIZE 3000000 32000000
+EPOCSTACKSIZE 80000
+EPOCHEAPSIZE 3000000 64000000
START BITMAP ScummVM.mbm
TARGETPATH \Resource\Apps
@@ -89,9 +91,9 @@
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
-SYSTEMINCLUDE \epoc32\include\libc
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
@@ -112,8 +114,8 @@
SOURCE backends\platform\sdl\graphics.cpp
SOURCE backends\platform\sdl\sdl.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\SymbianOS.cpp
+SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
SOURCE gui\Key.cpp
@@ -124,10 +126,10 @@
source graphics\iff.cpp
// *** Dynamic Libraries
-LIBRARY cone.lib eikcore.lib
-LIBRARY euser.lib apparc.lib fbscli.lib
+LIBRARY cone.lib eikcore.lib
+LIBRARY euser.lib apparc.lib fbscli.lib
LIBRARY estlib.lib apgrfx.lib
LIBRARY gdi.lib hal.lib bitgdi.lib
LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
LIBRARY qikctl.lib
-library qikcore.lib bafl.lib eikcoctl.lib
\ No newline at end of file
+library qikcore.lib bafl.lib eikcoctl.lib
\ No newline at end of file
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_agi.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_agi.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_agi.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_agos.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_agos.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_agos.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_base.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_base.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_base.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,13 +30,14 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
// Note: the LIB:*.lib statements are used by AdaptAllMMPs.pl, so don't remove them!
//START_AUTO_MACROS_MASTER//
// empty base file, will be updated by Perl build scripts
-
+
// list of possible MACROs: (will be replaced when generating scummvm_base.mmp)
//MACRO USE_ZLIB // LIB:zlib.lib
//MACRO USE_MAD // LIB:libmad.lib
@@ -67,9 +68,9 @@
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
-SYSTEMINCLUDE \epoc32\include\libc
+SYSTEMINCLUDE \epoc32\include\ESDL
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include\tremor
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
@@ -119,6 +120,6 @@
source backends\saves\savefile.cpp
source backends\saves\default\default-saves.cpp
source backends\saves\compressed\compressed-saves.cpp
-source engines\engine.cpp
+source engines\engine.cpp
// backend specific includes
// backend specific includes
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_cine.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_cine.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_cine.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_cruise.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_cruise.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_drascula.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_drascula.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_gob.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_gob.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_gob.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_igor.mmp.in
===================================================================
(Binary files differ)
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_kyra.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_kyra.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_lure.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_lure.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_lure.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
@@ -50,6 +51,6 @@
// *** Include paths
-USERINCLUDE ..\..\..\..\engines
+USERINCLUDE ..\..\..\..\engines
USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src
SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_queen.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_queen.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_queen.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_saga.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_saga.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_saga.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
@@ -65,7 +66,7 @@
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
+SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
+SYSTEMINCLUDE \epoc32\include\libc
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\src // for portdefs.h
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sky.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sky.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sky.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sword1.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sword1.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sword2.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_sword2.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_touche.mmp.in
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_touche.mmp.in 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/mmp/scummvm_touche.mmp.in 2008-01-29 21:32:42 UTC (rev 30705)
@@ -30,6 +30,7 @@
TARGETTYPE lib
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
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/src/SymbianOS.cpp 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/src/SymbianOS.cpp 2008-01-29 21:32:42 UTC (rev 30705)
@@ -35,6 +35,13 @@
#include "..\..\sdl\main.cpp"
+#ifdef SAMPLES_PER_SEC_8000 // the GreanSymbianMMP format cannot handle values for defines :(
+ #define SAMPLES_PER_SEC 8000
+#else
+ #define SAMPLES_PER_SEC 16000
+#endif
+
+
////////// extern "C" ///////////////////////////////////////////////////
namespace Symbian {
@@ -52,9 +59,8 @@
}
// make this easily available everywhere
-char* GetExecutablePath()
-{
- return CSDLApp::GetExecutablePathCStr();
+char* GetExecutablePath() {
+ return CSDLApp::GetExecutablePathCStr();
}
} // namespace Symbian {
@@ -93,7 +99,7 @@
break;
case kFeatureDisableKeyFiltering:
GUI::Actions::Instance()->beginMapping(enable);
- break;;
+ break;
default:
OSystem_SDL::setFeatureState(f, enable);
}
Modified: scummvm/branches/branch-0-11-0/backends/platform/symbian/src/main_features.inl
===================================================================
--- scummvm/branches/branch-0-11-0/backends/platform/symbian/src/main_features.inl 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/backends/platform/symbian/src/main_features.inl 2008-01-29 21:32:42 UTC (rev 30705)
@@ -24,7 +24,7 @@
"Vibra "
#endif
"\n"
-
+
// we want a list of supported engines visible in the program,
// because we also release special builds with only one engine
#ifndef DISABLE_SCUMM
@@ -72,6 +72,11 @@
#ifndef DISABLE_IGOR
"Igor "
#endif
+#ifndef DISABLE_PARALLACTION
+ "Parallaction "
+#endif
+#ifndef DISABLE_CRUISE
+ "Cruise "
+#endif
-
Modified: scummvm/branches/branch-0-11-0/engines/gob/util.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/gob/util.cpp 2008-01-29 21:32:09 UTC (rev 30704)
+++ scummvm/branches/branch-0-11-0/engines/gob/util.cpp 2008-01-29 21:32:42 UTC (rev 30705)
@@ -324,8 +324,17 @@
void Util::setScrollOffset(int16 x, int16 y) {
processInput();
- _vm->_video->_scrollOffsetX = x >= 0 ? x : _vm->_draw->_scrollOffsetX;
- _vm->_video->_scrollOffsetY = y >= 0 ? y : _vm->_draw->_scrollOffsetY;
+
+ if(x >= 0)
+ _vm->_video->_scrollOffsetX = x;
+ else
+ _vm->_video->_scrollOffsetX = _vm->_draw->_scrollOffsetX;
+
+ if(y >= 0)
+ _vm->_video->_scrollOffsetY = y;
+ else
+ _vm->_video->_scrollOffsetY = _vm->_draw->_scrollOffsetY;
+
_vm->_video->waitRetrace();
}
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