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. --- backends/platform/symbian/UIQ3/BLD.INF.in | 1 + .../platform/symbian/UIQ3/ScummVM_A0000658_UIQ3.mmp.in | 2 +- backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in | 2 +- .../platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg | 18 +++++++++++++----- .../symbian/UIQ3/scummvm-CVS-SymbianUIQ3_split.pkg | 18 +++++++++++++----- 5 files changed, 29 insertions(+), 12 deletions(-) (limited to 'backends/platform/symbian/UIQ3') 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