From f0cd01b5764f702ca5696e4728b102035fb9f0b1 Mon Sep 17 00:00:00 2001 From: Lars Persson Date: Wed, 9 May 2007 19:49:02 +0000 Subject: Updated support for Cruise svn-id: r26794 --- backends/platform/symbian/AdaptAllMMPs.pl | 3 +- .../symbian/BuildPackageUpload_LocalSettings.pl | 5 +- backends/platform/symbian/mmp/scummvm_base.mmp.in | 2 + .../platform/symbian/mmp/scummvm_cruise.mmp.in | 54 ++++++++++++++++++++++ 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 backends/platform/symbian/mmp/scummvm_cruise.mmp.in diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl index 1b8e8d126c..4c4a90967f 100644 --- a/backends/platform/symbian/AdaptAllMMPs.pl +++ b/backends/platform/symbian/AdaptAllMMPs.pl @@ -20,6 +20,7 @@ chdir("../../../"); "mmp/scummvm_agi.mmp", "mmp/scummvm_touche.mmp", "mmp/scummvm_parallaction.mmp", + "mmp/scummvm_cruise.mmp", "S60/ScummVM_S60.mmp", "S60v3/ScummVM_S60v3.mmp", "S80/ScummVM_S80.mmp", @@ -80,7 +81,6 @@ ParseModule("_agos", "agos", \@section_empty); ParseModule("_sky", "sky", \@section_empty); ParseModule("_gob", "gob", \@section_empty); ParseModule("_saga", "saga", \@section_empty); - ParseModule("_kyra", "kyra", \@section_empty); ParseModule("_sword1", "sword1", \@section_empty); ParseModule("_sword2", "sword2", \@section_empty); @@ -89,6 +89,7 @@ ParseModule("_cine", "cine", \@section_empty); ParseModule("_agi", "agi", \@section_empty); ParseModule("_touche", "touche", \@section_empty); ParseModule("_parallaction","parallaction",\@section_empty); +ParseModule("_cruise", "cruise", \@section_empty); print " ======================================================================================= Done. Enjoy :P diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl index a276b80223..bd2a3cf0dc 100644 --- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl +++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl @@ -5,12 +5,13 @@ $DefaultTopMacros = " MACRO USE_ZLIB // LIB:zlib.lib MACRO USE_MAD // LIB:libmad.lib - //MACRO USE_TREMOR // LIB:libtremor.lib + MACRO USE_TREMOR // LIB:libtremor.lib "; $DefaultBottomMacros = " MACRO DISABLE_SWORD1 // LIB:scummvm_sword1.lib MACRO DISABLE_SWORD2 // LIB:scummvm_sword2.lib + MACRO DISABLE_PARALLACTION // LIB:scummvm_parallaction.lib "; ## @@ -125,7 +126,7 @@ if (1) # all regular combo's //MACRO DISABLE_TOUCHE // LIB:scummvm_touche.lib //MACRO DISABLE_CINE // LIB:scummvm_cine.lib //MACRO DISABLE_LURE // LIB:scummvm_lure.lib - + //MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib $DefaultBottomMacros"; # now one for each ready-for-release engine diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in index fb62b4943e..a1f3f1b261 100644 --- a/backends/platform/symbian/mmp/scummvm_base.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in @@ -56,6 +56,8 @@ OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way //MACRO DISABLE_CINE // LIB:scummvm_cine.lib //MACRO DISABLE_AGI // LIB:scummvm_agi.lib //MACRO DISABLE_PARALLACTION // LIB:scummvm_parallaction.lib + //MACRO DISABLE_CRUISE // LIB:scummvm_cruise.lib + //STOP_AUTO_MACROS_MASTER// diff --git a/backends/platform/symbian/mmp/scummvm_cruise.mmp.in b/backends/platform/symbian/mmp/scummvm_cruise.mmp.in new file mode 100644 index 0000000000..05092777b0 --- /dev/null +++ b/backends/platform/symbian/mmp/scummvm_cruise.mmp.in @@ -0,0 +1,54 @@ +/* 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-2007 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_cruise.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\cruise + +//START_AUTO_OBJECTS_CRUISE_// + + // empty base file, will be updated by Perl build scripts + +//STOP_AUTO_OBJECTS_CRUISE_// + +// *** Include paths + +USERINCLUDE ..\..\..\..\engines +USERINCLUDE ..\..\..\.. ..\..\..\..\common ..\..\..\..\gui ..\..\..\..\sound ..\src +SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src -- cgit v1.2.3