[Scummvm-cvs-logs] SF.net SVN: scummvm: [24941] scummvm/trunk
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Thu Dec 28 13:15:00 CET 2006
Revision: 24941
http://scummvm.svn.sourceforge.net/scummvm/?rev=24941&view=rev
Author: anotherguest
Date: 2006-12-28 04:14:58 -0800 (Thu, 28 Dec 2006)
Log Message:
-----------
Updated makefiles to support touche and agos naming properly
Modified Paths:
--------------
scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
scummvm/trunk/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in
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/S90/Scummvm_S90.mmp.in
scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
scummvm/trunk/backends/platform/symbian/src/main_features.inl
scummvm/trunk/base/plugins.cpp
Added Paths:
-----------
scummvm/trunk/backends/platform/symbian/mmp/scummvm_touche.mmp.in
Modified: scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
===================================================================
--- scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl 2006-12-28 12:14:58 UTC (rev 24941)
@@ -18,6 +18,7 @@
"mmp/scummvm_lure.mmp",
"mmp/scummvm_cine.mmp",
"mmp/scummvm_agi.mmp",
+ "mmp/scummvm_touche.mmp",
"S60/ScummVM_S60.mmp",
"S60v3/ScummVM_S60v3.mmp",
"S80/ScummVM_S80.mmp",
@@ -85,6 +86,7 @@
ParseModule("_lure", "lure", \@section_empty);
ParseModule("_cine", "cine", \@section_empty);
ParseModule("_agi", "agi", \@section_empty);
+ParseModule("_touche", "touche", \@section_empty);
print "
=======================================================================================
Done. Enjoy :P
Modified: scummvm/trunk/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
===================================================================
--- scummvm/trunk/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl 2006-12-28 12:14:58 UTC (rev 24941)
@@ -11,8 +11,6 @@
$DefaultBottomMacros = "
MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib
MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib
- MACRO DISABLE_LURE // LIB:scummvm_lure.lib
- MACRO DISABLE_CINE // LIB:scummvm_cine.lib
";
##
@@ -99,30 +97,35 @@
# scummvm-051101-SymbianS80_queen.sis
# scummvm-051101-SymbianS90_queen.sis
- $SDK_Variations{'UIQ2'}{'test'} = "$DefaultTopMacro
- MACRO USE_TREMOR // LIB:libtremor.lib
- //MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
- //MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
- //MACRO DISABLE_SKY // LIB:scummvm_sky.lib
- //MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
- //MACRO DISABLE_GOB // LIB:scummvm_gob.lib
- //MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
- //MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
- $DefaultBottomMacros";
-# $SDK_Variations{'S60v1'}{'test'} = $SDK_Variations{'UIQ2'}{'test'};
+ #$SDK_Variations{'ALL'}{'test'} = "$DefaultTopMacro
+ # //MACRO USE_TREMOR // LIB:libtremor.lib
+ # //MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
+ # //MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
+ # //MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+ # //MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
+ # //MACRO DISABLE_GOB // LIB:scummvm_gob.lib
+ # //MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
+ # //MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+ #$DefaultBottomMacros";
+ #$SDK_Variations{'S60v1'}{'test'} = $SDK_Variations{'UIQ2'}{'test'};
-if (0) # all regular combo's
+if (1) # all regular combo's
{
- # the first one includes all SDKs & engines
+ # the first one includes all SDKs & release-ready engines
$SDK_Variations{'ALL'}{'all'} = "$DefaultTopMacros
//MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
//MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
- //MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+ //MACRO DISABLE_SKY // LIB:scummvm_sky.lib
//MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
- //MACRO DISABLE_GOB // LIB:scummvm_gob.lib
+ //MACRO DISABLE_GOB // LIB:scummvm_gob.lib
//MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
//MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+ //MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ //MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+ //MACRO DISABLE_CINE // LIB:scummvm_cine.lib
+ //MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+
$DefaultBottomMacros";
# now one for each ready-for-release engine
@@ -135,16 +138,24 @@
MACRO DISABLE_GOB // LIB:scummvm_gob.lib
MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+ MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_cine.lib
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
$DefaultBottomMacros";
$SDK_Variations{'ALL'}{'agos'} = "$DefaultTopMacros
MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
//MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
- MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+ MACRO DISABLE_SKY // LIB:scummvm_sky.lib
MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
MACRO DISABLE_GOB // LIB:scummvm_gob.lib
MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+ MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_cine.lib
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
$DefaultBottomMacros";
$SDK_Variations{'ALL'}{'sky'} = "$DefaultTopMacros
@@ -155,6 +166,10 @@
MACRO DISABLE_GOB // LIB:scummvm_gob.lib
MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+ MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_cine.lib
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
$DefaultBottomMacros";
$SDK_Variations{'ALL'}{'queen'} = "$DefaultTopMacros
@@ -165,6 +180,10 @@
MACRO DISABLE_GOB // LIB:scummvm_gob.lib
MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+ MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_cine.lib
$DefaultBottomMacros";
$SDK_Variations{'ALL'}{'gob'} = "$DefaultTopMacros
@@ -175,16 +194,24 @@
//MACRO DISABLE_GOB // LIB:scummvm_gob.lib
MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+ MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_cine.lib
$DefaultBottomMacros";
$SDK_Variations{'ALL'}{'saga'} = "$DefaultTopMacros
MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
- MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+ MACRO DISABLE_SKY // LIB:scummvm_sky.lib
MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
- MACRO DISABLE_GOB // LIB:scummvm_gob.lib
+ MACRO DISABLE_GOB // LIB:scummvm_gob.lib
//MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+ MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_cine.lib
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
$DefaultBottomMacros";
$SDK_Variations{'ALL'}{'kyra'} = "$DefaultTopMacros
@@ -195,28 +222,19 @@
MACRO DISABLE_GOB // LIB:scummvm_gob.lib
MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
//MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+ MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_cine.lib
$DefaultBottomMacros";
# below here you could specify weird & experimental combinations, non-ready engines
- $SDK_Variations{'ALL'}{'test_lure'} = "$DefaultTopMacros
- MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
- MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
- MACRO DISABLE_SKY // LIB:scummvm_sky.lib
- MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
- MACRO DISABLE_GOB // LIB:scummvm_gob.lib
- MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
- MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
- MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib
- MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib
- //MACRO DISABLE_LURE // LIB:scummvm_lure.lib
- MACRO DISABLE_CINE
- $DefaultBottomMacros";
-
$SDK_Variations{'ALL'}{'saga_mini'} = "
//MACRO USE_ZLIB // LIB:zlib.lib
//MACRO USE_MAD // LIB:libmad.lib
//MACRO USE_TREMOR // LIB:libtremor.lib
+
MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
MACRO DISABLE_SKY // LIB:scummvm_sky.lib
@@ -224,36 +242,118 @@
MACRO DISABLE_GOB // LIB:scummvm_gob.lib
//MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
- MACRO DISABLE_CINE
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+ MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_cine.lib
$DefaultBottomMacros";
$SDK_Variations{'ALL'}{'scumm_no78he'} = "
MACRO USE_ZLIB // LIB:zlib.lib
MACRO USE_MAD // LIB:libmad.lib
//MACRO USE_TREMOR // LIB:libtremor.lib
+ MACRO DISABLE_SCUMM_7_8
+ MACRO DISABLE_SCUMM_HE
+
//MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
MACRO DISABLE_SKY // LIB:scummvm_sky.lib
MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
MACRO DISABLE_GOB // LIB:scummvm_gob.lib
MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
- MACRO DISABLE_SCUMM_7_8
- MACRO DISABLE_SCUMM_HE
MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
- MACRO DISABLE_CINE
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+ MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_cine.lib
$DefaultBottomMacros";
# $SDK_Variations{'ALL'}{'all_vorbis'} = "
# MACRO USE_ZLIB // LIB:zlib.lib
# MACRO USE_MAD // LIB:libmad.lib
# MACRO USE_TREMOR // LIB:libtremor.lib
+#
# //MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
# //MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
# //MACRO DISABLE_SKY // LIB:scummvm_sky.lib
# //MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
# //MACRO DISABLE_GOB // LIB:scummvm_gob.lib
# //MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
+# //MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
# $DefaultBottomMacros";
+
+ $SDK_Variations{'ALL'}{'test_lure'} = "$DefaultTopMacros
+ MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
+ MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
+ MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+ MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
+ MACRO DISABLE_GOB // LIB:scummvm_gob.lib
+ MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
+ MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+
+ MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib
+ MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib
+ //MACRO DISABLE_LURE // LIB:scummvm_lure.lib
+ MACRO DISABLE_CINE // LIB:scummvm_agi.lib
+ MACRO DISABLE_AGI // LIB:scummvm_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+ ";
+
+ # empty $SDK_Variations{''} string instead of 'ALL' = package disabled
+ $SDK_Variations{'ALL'}{'test_cine'} = "$DefaultTopMacros
+ MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
+ MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
+ MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+ MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
+ MACRO DISABLE_GOB // LIB:scummvm_gob.lib
+ MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
+ MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+
+ MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib
+ 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_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+
+ ";
+
+ $SDK_Variations{'ALL'}{'test_agi'} = "$DefaultTopMacros
+ MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
+ MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
+ MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+ MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
+ MACRO DISABLE_GOB // LIB:scummvm_gob.lib
+ MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
+ MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+
+ MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib
+ 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_agi.lib
+ MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+
+ ";
+
+
+ $SDK_Variations{'ALL'}{'test_touche'} = "$DefaultTopMacros
+ MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
+ MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
+ MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+ MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
+ MACRO DISABLE_GOB // LIB:scummvm_gob.lib
+ MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
+ MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+
+ MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib
+ 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_agi.lib
+ //MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib
+
+ ";
}
#
@@ -274,7 +374,7 @@
#
# for mega-fast-testing only plz!
-# $SDK_Variations{'UIQ2'}{'(fast_empty)'} = "
+# $SDK_Variations{'ALL'}{'(fast_empty)'} = "
# //MACRO USE_ZLIB // LIB:zlib.lib
# //MACRO USE_MAD // LIB:libmad.lib
# //MACRO USE_TREMOR // LIB:libtremor.lib
Modified: scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/S60/ScummVM_S60.mmp.in 2006-12-28 12:14:58 UTC (rev 24941)
@@ -39,7 +39,7 @@
#if !defined(WINS)
EPOCSTACKSIZE 0x00008000
-EPOCHEAPSIZE 2048000 8192000
+EPOCHEAPSIZE 2048000 161920000
#endif
MACRO S60
Modified: scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2006-12-28 12:14:58 UTC (rev 24941)
@@ -63,7 +63,7 @@
END
EPOCSTACKSIZE 0x0000F000
-EPOCHEAPSIZE 2048000 16192000
+EPOCHEAPSIZE 2048000 32000000
ALWAYS_BUILD_AS_ARM
MACRO S60
MACRO S60V3
Modified: scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg 2006-12-28 12:14:58 UTC (rev 24941)
@@ -48,10 +48,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:\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
+""-"c:\data\scummvm\scummvm.ini",FILENULL
+""-"c:\data\scummvm\scummvm.stdout.txt",FILENULL
+""-"c:\data\scummvm\scummvm.stderr.txt",FILENULL
+""-"c:\data\scummvm\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/platform/symbian/S80/ScummVM_S80.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/S80/ScummVM_S80.mmp.in 2006-12-28 12:14:58 UTC (rev 24941)
@@ -38,7 +38,7 @@
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
EPOCSTACKSIZE 0x00008000
-EPOCHEAPSIZE 1024 8192000
+EPOCHEAPSIZE 3024000 16192000
MACRO S80
Modified: scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/S90/Scummvm_S90.mmp.in 2006-12-28 12:14:58 UTC (rev 24941)
@@ -38,7 +38,7 @@
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
EPOCSTACKSIZE 0x00008000
-EPOCHEAPSIZE 1024 8192000
+EPOCHEAPSIZE 1024 161920000
MACRO S90
Modified: scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2006-12-28 12:14:58 UTC (rev 24941)
@@ -47,7 +47,7 @@
END
EPOCSTACKSIZE 0x0000FFFF
-EPOCHEAPSIZE 0xFA000 0xfA0000
+EPOCHEAPSIZE 3000000 32000000
START BITMAP ScummVM.mbm
TARGETPATH \Resource\Apps
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in 2006-12-28 12:14:58 UTC (rev 24941)
@@ -45,9 +45,9 @@
//MACRO DISABLE_SCUMM_HE
//MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
//MACRO DISABLE_AGOS // LIB:scummvm_agos.lib
- //MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+ //MACRO DISABLE_SKY // LIB:scummvm_sky.lib
//MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
- //MACRO DISABLE_GOB // LIB:scummvm_gob.lib
+ //MACRO DISABLE_GOB // LIB:scummvm_gob.lib
//MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
//MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
//MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib
@@ -109,5 +109,6 @@
source backends\timer\default\default-timer.cpp
source backends\saves\savefile.cpp
source backends\saves\default\default-saves.cpp
+source engines\engine.cpp
// backend specific includes
// backend specific includes
Added: scummvm/trunk/backends/platform/symbian/mmp/scummvm_touche.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_touche.mmp.in (rev 0)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_touche.mmp.in 2006-12-28 12:14:58 UTC (rev 24941)
@@ -0,0 +1,55 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson - Original EPOC port, ESDL
+ * Copyright (C) 2003-2005 Lars 'AnotherGuest' Persson - Original EPOC port, Audio System
+ * Copyright (C) 2005 Jurgen 'SumthinWicked' Braam - EPOC/CVS maintainer
+ * Copyright (C) 2005-2006 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+//
+// EPOC MMP makefile project for ScummVM
+//
+
+// *** Definitions
+
+TARGET scummvm_touche.lib
+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
+
+//START_AUTO_MACROS_SLAVE//
+
+ // empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..\..\engines\touche
+
+//START_AUTO_OBJECTS_TOUCHE_//
+
+ // empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_TOUCHE_//
+
+// *** Include paths
+
+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
Property changes on: scummvm/trunk/backends/platform/symbian/mmp/scummvm_touche.mmp.in
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: scummvm/trunk/backends/platform/symbian/src/main_features.inl
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/main_features.inl 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/backends/platform/symbian/src/main_features.inl 2006-12-28 12:14:58 UTC (rev 24941)
@@ -64,3 +64,7 @@
"AGI "
#endif
+#ifndef DISABLE_TOUCHE
+ "Touche "
+#endif
+
Modified: scummvm/trunk/base/plugins.cpp
===================================================================
--- scummvm/trunk/base/plugins.cpp 2006-12-28 11:52:24 UTC (rev 24940)
+++ scummvm/trunk/base/plugins.cpp 2006-12-28 12:14:58 UTC (rev 24941)
@@ -150,7 +150,7 @@
#ifndef DISABLE_AGI
LINK_PLUGIN(AGI)
#endif
- #ifndef DISABLE_TOUCHE
+ #ifndef '
LINK_PLUGIN(TOUCHE)
#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