From 92cfa0aa68fadaff1498d347f7dd2e8121f73ae9 Mon Sep 17 00:00:00 2001 From: Lars Persson Date: Sun, 12 Feb 2006 13:08:11 +0000 Subject: svn-id: r20606 --- backends/epoc/AdaptAllMMPs.pl | 8 ++++---- backends/epoc/S60/ScummVM_S60_App.mmp | 3 +-- backends/epoc/S80/ScummVM_S80_App.mmp | 3 +-- backends/epoc/S90/Scummvm_S90_App.mmp | 3 +-- backends/epoc/UIQ2/ScummVM.rss | 2 +- backends/epoc/UIQ3/scummvm-CVS-SymbianUIQ3.pkg | 8 ++++---- backends/epoc/mmp/initial_mmps.zip | Bin 29047 -> 28765 bytes backends/epoc/res/ScummVmAif.rss | 3 +-- backends/epoc/res/scummvm.rss | 2 +- 9 files changed, 14 insertions(+), 18 deletions(-) diff --git a/backends/epoc/AdaptAllMMPs.pl b/backends/epoc/AdaptAllMMPs.pl index fc1873ab79..357c1bbc1b 100644 --- a/backends/epoc/AdaptAllMMPs.pl +++ b/backends/epoc/AdaptAllMMPs.pl @@ -26,7 +26,7 @@ Preparing to update all the Symbian MMP project files with objects from module.m my @section_empty = (""); # section standard: no #ifdef's in module.mk files my @sections_scumm = ("", "DISABLE_SCUMM_7_8", "DISABLE_HE"); # special sections for engine SCUMM -my @base_excludes = ("mt32","fluidsynth"); # case insensitive exclusions for sound +my @base_excludes = ("mt32","fluidsynth","i386","part","partial","partialmanager","synth","tables","freeverb"); # case insensitive exclusions for sound #arseModule(mmpStr, dirStr, ifdefArray, [exclusionsArray]) #ParseModule("_base", "base", \@section_empty); # now in ./TRG/ScummVM_TRG.mmp, these never change anyways... @@ -34,12 +34,12 @@ ParseModule("_base", "common", \@section_empty); ParseModule("_base", "gui", \@section_empty); ParseModule("_base", "graphics", \@section_empty); ParseModule("_base", "sound", \@section_empty, \@base_excludes); - +chdir("engines/"); ParseModule("_scumm", "scumm", \@sections_scumm); ParseModule("_queen", "queen", \@section_empty); ParseModule("_simon", "simon", \@section_empty); -ParseModule("_sky", "sky", \@section_empty); -ParseModule("_gob", "gob", \@section_empty); +ParseModule("_sky", "sky", \@section_empty); +ParseModule("_gob", "gob", \@section_empty); ParseModule("_saga", "saga", \@section_empty); ParseModule("_kyra", "kyra", \@section_empty); diff --git a/backends/epoc/S60/ScummVM_S60_App.mmp b/backends/epoc/S60/ScummVM_S60_App.mmp index 030175b286..6caf91009b 100644 --- a/backends/epoc/S60/ScummVM_S60_App.mmp +++ b/backends/epoc/S60/ScummVM_S60_App.mmp @@ -2,7 +2,7 @@ * 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 The ScummVM project + * 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 @@ -18,7 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Header: */ // diff --git a/backends/epoc/S80/ScummVM_S80_App.mmp b/backends/epoc/S80/ScummVM_S80_App.mmp index 6cc6d044c4..09fa822bc7 100644 --- a/backends/epoc/S80/ScummVM_S80_App.mmp +++ b/backends/epoc/S80/ScummVM_S80_App.mmp @@ -2,7 +2,7 @@ * 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 The ScummVM project + * 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 @@ -18,7 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Header: */ // diff --git a/backends/epoc/S90/Scummvm_S90_App.mmp b/backends/epoc/S90/Scummvm_S90_App.mmp index 4fdd245a51..62a045e146 100644 --- a/backends/epoc/S90/Scummvm_S90_App.mmp +++ b/backends/epoc/S90/Scummvm_S90_App.mmp @@ -2,7 +2,7 @@ * 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 The ScummVM project + * 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 @@ -18,7 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Header: */ // diff --git a/backends/epoc/UIQ2/ScummVM.rss b/backends/epoc/UIQ2/ScummVM.rss index 41aa0a59e2..a55fabfc51 100644 --- a/backends/epoc/UIQ2/ScummVM.rss +++ b/backends/epoc/UIQ2/ScummVM.rss @@ -2,7 +2,7 @@ * 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 The ScummVM project + * 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 diff --git a/backends/epoc/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/epoc/UIQ3/scummvm-CVS-SymbianUIQ3.pkg index 2574cd99cf..adadf9fee5 100644 --- a/backends/epoc/UIQ3/scummvm-CVS-SymbianUIQ3.pkg +++ b/backends/epoc/UIQ3/scummvm-CVS-SymbianUIQ3.pkg @@ -10,17 +10,17 @@ :"ScummVM" ; UID is the app's UID -#{"ScummVM UIQ3"},(0xA0000657),0,80,3 +#{"ScummVM UIQ3"},(0xA0000657),0,90,0 ; ProductID for UIQ 3.0 ; Product/platform version UID, Major, Minor, Build, Product ID (0x101F6300), 3, 0, 0, {"UIQ30ProductID"} ; Application, AIF & Resource file -"\uiq3\epoc32\release\gcce\urel\ScummVM.exe"-"!:\sys\bin\ScummVM.exe" +"\uiq3\epoc32\release\gcce\urel\ScummVM.exe"- "!:\sys\bin\ScummVM.exe" "\uiq3\epoc32\data\z\resource\apps\ScummVM.rsc"- "!:\resource\apps\ScummVM.rsc" -"\uiq3\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"-"!:\resource\apps\scummvm_loc.rsc" -"\uiq3\epoc32\data\Z\resource\APPS\scummvm.MBM"-"!:\resource\apps\scummvm.MBM" +"\uiq3\epoc32\Data\Z\resource\apps\scummvm_loc.rsc"- "!:\resource\apps\scummvm_loc.rsc" +"\uiq3\epoc32\data\Z\resource\APPS\scummvm.MBM"- "!:\resource\apps\scummvm.MBM" "\uiq3\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 diff --git a/backends/epoc/mmp/initial_mmps.zip b/backends/epoc/mmp/initial_mmps.zip index 0a64eb577a..96f6ca5700 100644 Binary files a/backends/epoc/mmp/initial_mmps.zip and b/backends/epoc/mmp/initial_mmps.zip differ diff --git a/backends/epoc/res/ScummVmAif.rss b/backends/epoc/res/ScummVmAif.rss index 0842fac3c8..ad222e550b 100644 --- a/backends/epoc/res/ScummVmAif.rss +++ b/backends/epoc/res/ScummVmAif.rss @@ -2,7 +2,7 @@ * 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 The ScummVM project + * 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 @@ -18,7 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Header: */ #include diff --git a/backends/epoc/res/scummvm.rss b/backends/epoc/res/scummvm.rss index f47c643fb4..684e42f4e5 100644 --- a/backends/epoc/res/scummvm.rss +++ b/backends/epoc/res/scummvm.rss @@ -2,7 +2,7 @@ * 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 The ScummVM project + * 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 -- cgit v1.2.3