From 666b881f16df31daa487f9a749fc3887c5a158e4 Mon Sep 17 00:00:00 2001 From: anotherguest Date: Thu, 10 Jul 2014 21:05:22 +0200 Subject: SYMBIAN: Merged changes from 1.7.0 branch for Symbian Makefiles and updated split build for main branch. --- .../symbian/BuildPackageUpload_LocalSettings.pl | 27 +++++++++++----------- .../symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in | 24 +++++++++---------- .../platform/symbian/S60v3/ScummVM_S60v3.mmp.in | 24 +++++++++---------- .../symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg | 2 +- .../S60v3/scummvm-CVS-SymbianS60v3_split.pkg | 2 +- backends/platform/symbian/UIQ3/BLD.INF.in | 1 + .../symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in | 2 +- backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in | 2 +- .../symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg | 18 +++++++++++---- .../symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg | 18 +++++++++++---- 10 files changed, 69 insertions(+), 51 deletions(-) diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl index 12fc2668e3..26c2e4f69d 100644 --- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl +++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl @@ -14,19 +14,20 @@ #### sword25 @WorkingEngines_1st = qw( - cine composer cruise drascula groovie - lastexpress made parallaction queen - saga scumm touche tucker wintermute - avalanche zvision voyeur + bbvs cine composer cruise + drascula groovie lastexpress + lure made mohawk parallaction pegasus queen + saga scumm + toltecs tony toon touche tucker wintermute + neverhood avalanche zvision voyeur ); @WorkingEngines_2nd = qw( - agi agos bbvs cge draci gob hopkins - hugo kyra lure mohawk pegasus sci - sky sword1 sword2 teenagent mads - tinsel tsage toltecs tony toon - dreamweb fullpipe mortevielle - neverhood testbed + agos agi cge draci + hugo gob kyra + sci sky sword1 sword2 teenagent tinsel + tsage + dreamweb fullpipe hopkins mortevielle mads ); #### sword25 @@ -227,7 +228,7 @@ $SDK_RootDirs{'UIQ3'}= "G:\\UIQ3"; #$SDK_RootDirs{'S60v1'}= "D:\\S60v1"; #$SDK_RootDirs{'S60v2'}= "D:\\S60v2"; - $SDK_RootDirs{'S60v3'}= "G:\\S60v3"; + $SDK_RootDirs{'S60v3'}= "G:\\S60v5"; #$SDK_RootDirs{'S80'}= "D:\\S80"; #$SDK_RootDirs{'S90'}= "D:\\S90"; #$ECompXL_BinDir= "D:\\ECompXL\\"; @@ -325,8 +326,8 @@ { # the first one includes all SDKs & release-ready engines - # $VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines"; - $VariationSets{'ALL'}{'split'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines"; + $VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines"; + #$VariationSets{'ALL'}{'split'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines"; # $VariationSets{'ALL'}{'1St'} = "$DefaultFeatures @WorkingEngines_1st @EnablableSubEngines"; # $VariationSets{'ALL'}{'2nd'} = "$DefaultFeatures @WorkingEngines_2nd @EnablableSubEngines"; # now one for each ready-for-release engine diff --git a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in index b33a10ecdd..3a08763e64 100644 --- a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in +++ b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in @@ -57,7 +57,7 @@ LANG SC END EPOCSTACKSIZE 80000 -EPOCHEAPSIZE 5000000 64000000 +EPOCHEAPSIZE 5000000 128000000 START BITMAP ScummVM.mbm TARGETPATH \Resource\Apps @@ -137,21 +137,21 @@ SOURCE gui\Actions.cpp SOURCE gui\Dialog.cpp // Common error -source common\error.cpp -source common\quicktime.cpp +SOURCE common\error.cpp +SOURCE common\quicktime.cpp // Special for graphics -source backends\graphics\symbiansdl\symbiansdl-graphics.cpp -source backends\graphics\surfacesdl\surfacesdl-graphics.cpp -source engines\obsolete.cpp +SOURCE backends\graphics\symbiansdl\symbiansdl-graphics.cpp +SOURCE backends\graphics\surfacesdl\surfacesdl-graphics.cpp +SOURCE engines\obsolete.cpp // *** Dynamic Libraries -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 avkon.lib bafl.lib remconcoreapi.lib remconinterfacebase.lib +LIBRARY cone.lib eikcore.lib euser.lib +LIBRARY apparc.lib fbscli.lib estlib.lib +LIBRARY apgrfx.lib gdi.lib hal.lib bitgdi.lib +LIBRARY esock.lib mediaclientaudiostream.lib +LIBRARY efsrv.lib ws32.lib avkon.lib bafl.lib +LIBRARY remconcoreapi.lib remconinterfacebase.lib CAPABILITY LocalServices ReadUserData MACRO SDL_BACKEND diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in index 0b4633e7bf..f65be1208e 100644 --- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in +++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in @@ -58,7 +58,7 @@ LANG SC END EPOCSTACKSIZE 80000 -EPOCHEAPSIZE 5000000 64000000 +EPOCHEAPSIZE 5000000 128000000 START BITMAP ScummVM.mbm TARGETPATH \Resource\Apps @@ -138,21 +138,21 @@ SOURCE gui\Actions.cpp SOURCE gui\Dialog.cpp // Common error -source common\error.cpp -source common\quicktime.cpp +SOURCE common\error.cpp +SOURCE common\quicktime.cpp // Special for graphics -source backends\graphics\symbiansdl\symbiansdl-graphics.cpp -source backends\graphics\surfacesdl\surfacesdl-graphics.cpp -source engines\obsolete.cpp +SOURCE backends\graphics\symbiansdl\symbiansdl-graphics.cpp +SOURCE backends\graphics\surfacesdl\surfacesdl-graphics.cpp +SOURCE engines\obsolete.cpp // *** Dynamic Libraries -LIBRARY cone.lib eikcore.lib -LIBRARY euser.lib apparc.lib fbscli.lib -LIBRARY estlib.lib apgrfx.lib -LIBRARY gdi.lib hal.lib bitgdi.lib esock.lib -LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib -library avkon.lib bafl.lib remconcoreapi.lib remconinterfacebase.lib +LIBRARY cone.lib eikcore.lib euser.lib +LIBRARY apparc.lib fbscli.lib estlib.lib +LIBRARY apgrfx.lib gdi.lib hal.lib bitgdi.lib +LIBRARY esock.lib mediaclientaudiostream.lib +LIBRARY efsrv.lib ws32.lib avkon.lib bafl.lib +LIBRARY remconcoreapi.lib remconinterfacebase.lib CAPABILITY LocalServices ReadUserData MACRO SDL_BACKEND diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg index 2ba65c4571..4c83b32805 100644 --- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg +++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg @@ -33,7 +33,7 @@ :"ScummVM" ; UID is the app's UID -#{"ScummVM S60v3"},(0xA0000657),1,70,0 +#{"ScummVM S60v3"},(0xA0000657),1,80,0 ;Supports Series 60 v 3.0 [0x101F7961], 0, 0, 0, {"Series60ProductID"} diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg index 2d2edf2803..3d55584d28 100644 --- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg +++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3_split.pkg @@ -36,7 +36,7 @@ :"ScummVM" ; UID is the app's UID -#{"ScummVM S60v3"},(0xA0000657),1,70,6 +#{"ScummVM S60v3"},(0xA0000657),1,80,0 ;Supports Series 60 v 3.0 [0x101F7961], 0, 0, 0, {"Series60ProductID"} diff --git a/backends/platform/symbian/UIQ3/BLD.INF.in b/backends/platform/symbian/UIQ3/BLD.INF.in index ff12dbdd75..4ca6be145b 100644 --- a/backends/platform/symbian/UIQ3/BLD.INF.in +++ b/backends/platform/symbian/UIQ3/BLD.INF.in @@ -7,5 +7,6 @@ PRJ_MMPFILES // empty base file, will be updated by Perl build scripts //STOP_AUTO_PROJECTS// +gnumakefile ..\help\build_help.mk .\ScummVM_A0000658_UIQ3.mmp .\ScummVM_UIQ3.mmp diff --git a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in index bb6c3ed9ec..6e84ab7b08 100644 --- a/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in +++ b/backends/platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in @@ -58,7 +58,7 @@ LANG SC END EPOCSTACKSIZE 80000 -EPOCHEAPSIZE 5000000 64000000 +EPOCHEAPSIZE 5000000 128000000 START BITMAP ScummVM.mbm TARGETPATH \Resource\Apps diff --git a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in index 3681a2df29..fee0c81e7a 100644 --- a/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in +++ b/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in @@ -58,7 +58,7 @@ LANG SC END EPOCSTACKSIZE 80000 -EPOCHEAPSIZE 5000000 64000000 +EPOCHEAPSIZE 5000000 128000000 START BITMAP ScummVM.mbm TARGETPATH \Resource\Apps diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg index 5db65e8e5c..8ac6f97d9f 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),1,70,0 +#{"ScummVM UIQ3"},(0xA0000657),1,80,0 ; ProductID for UIQ 3.0 ; Product/platform version UID, Major, Minor, Build, Product ID @@ -50,19 +50,27 @@ ; Scummvm Documentation "..\..\..\..\COPYRIGHT"-"!:\resource\apps\scummvm\COPYRIGHT", FT, TC "..\..\..\..\COPYING"-"!:\resource\apps\scummvm\COPYING", FT, TC -"..\README"-"!:\system\apps\scummvm\SYMBIAN_README", FT, TC +"..\README"-"!:\resource\apps\scummvm\SYMBIAN_README", FT, TC "..\..\..\..\AUTHORS"-"!:\resource\apps\scummvm\AUTHORS" "..\..\..\..\README"-"!:\resource\apps\scummvm\README" "..\..\..\..\NEWS"-"!:\resource\apps\scummvm\NEWS" +; Scummvm help +"..\help\ScummVM.hlp"-"!:\resource\help\ScummVM.hlp" + ; Common datafiles needed for some games -"..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat" -"..\..\..\..\dists\engine-data\sky.cpt"-"c:\shared\scummvm\sky.cpt" +"..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat" "..\..\..\..\dists\engine-data\hugo.dat"-"c:\shared\scummvm\hugo.dat" +"..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat" "..\..\..\..\dists\engine-data\lure.dat"-"c:\shared\scummvm\lure.dat" -"..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat" +"..\..\..\..\dists\engine-data\mort.dat"-"c:\shared\scummvm\mort.dat" +"..\..\..\..\dists\engine-data\neverhood.dat"-"c:\shared\scummvm\neverhood.dat" +"..\..\..\..\dists\engine-data\queen.tbl"-"c:\shared\scummvm\queen.tbl" +"..\..\..\..\dists\engine-data\sky.cpt"-"c:\shared\scummvm\sky.cpt" "..\..\..\..\dists\engine-data\teenagent.dat"-"c:\shared\scummvm\teenagent.dat" +"..\..\..\..\dists\engine-data\tony.dat"-"c:\shared\scummvm\tony.dat" "..\..\..\..\dists\engine-data\toon.dat"-"c:\shared\scummvm\toon.dat" +"..\..\..\..\dists\engine-data\wintermute.zip"-"c:\shared\scummvm\wintermute.zip" "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\shared\scummvm\vkeybd_default.zip" "..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\shared\scummvm\vkeybd_small.zip" "..\..\..\..\gui\themes\translations.dat"-"c:\shared\scummvm\translations.dat" diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg index d783bd51bd..4c46be50a1 100644 --- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg +++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg @@ -35,7 +35,7 @@ :"ScummVM" ; UID is the app's UID -#{"ScummVM UIQ3"},(0xA0000657),1,70,0 +#{"ScummVM UIQ3"},(0xA0000657),1,80,0 ; ProductID for UIQ 3.0 ; Product/platform version UID, Major, Minor, Build, Product ID @@ -58,19 +58,27 @@ ; Scummvm Documentation "..\..\..\..\COPYRIGHT"-"!:\resource\apps\scummvm\COPYRIGHT", FT, TC "..\..\..\..\COPYING"-"!:\resource\apps\scummvm\COPYING", FT, TC -"..\README"-"!:\system\apps\scummvm\SYMBIAN_README", FT, TC +"..\README"-"!:\resource\apps\scummvm\SYMBIAN_README", FT, TC "..\..\..\..\AUTHORS"-"!:\resource\apps\scummvm\AUTHORS" "..\..\..\..\README"-"!:\resource\apps\scummvm\README" "..\..\..\..\NEWS"-"!:\resource\apps\scummvm\NEWS" +; Scummvm help +"..\help\ScummVM.hlp"-"!:\resource\help\ScummVM.hlp" + ; Common datafiles needed for some games -"..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat" -"..\..\..\..\dists\engine-data\sky.cpt"-"c:\shared\scummvm\sky.cpt" +"..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat" "..\..\..\..\dists\engine-data\hugo.dat"-"c:\shared\scummvm\hugo.dat" +"..\..\..\..\dists\engine-data\kyra.dat"-"c:\shared\scummvm\kyra.dat" "..\..\..\..\dists\engine-data\lure.dat"-"c:\shared\scummvm\lure.dat" -"..\..\..\..\dists\engine-data\drascula.dat"-"c:\shared\scummvm\drascula.dat" +"..\..\..\..\dists\engine-data\mort.dat"-"c:\shared\scummvm\mort.dat" +"..\..\..\..\dists\engine-data\neverhood.dat"-"c:\shared\scummvm\neverhood.dat" +"..\..\..\..\dists\engine-data\queen.tbl"-"c:\shared\scummvm\queen.tbl" +"..\..\..\..\dists\engine-data\sky.cpt"-"c:\shared\scummvm\sky.cpt" "..\..\..\..\dists\engine-data\teenagent.dat"-"c:\shared\scummvm\teenagent.dat" +"..\..\..\..\dists\engine-data\tony.dat"-"c:\shared\scummvm\tony.dat" "..\..\..\..\dists\engine-data\toon.dat"-"c:\shared\scummvm\toon.dat" +"..\..\..\..\dists\engine-data\wintermute.zip"-"c:\shared\scummvm\wintermute.zip" "..\..\..\vkeybd\packs\vkeybd_default.zip"-"c:\shared\scummvm\vkeybd_default.zip" "..\..\..\vkeybd\packs\vkeybd_small.zip"-"c:\shared\scummvm\vkeybd_small.zip" "..\..\..\..\gui\themes\translations.dat"-"c:\shared\scummvm\translations.dat" -- cgit v1.2.3