diff options
-rw-r--r-- | backends/symbian/AdaptAllMMPs.pl | 1 | ||||
-rw-r--r-- | backends/symbian/S60/ScummVM_S60.mmp.in | 2 | ||||
-rw-r--r-- | backends/symbian/S60v3/ScummVM_S60v3.mmp.in | 2 | ||||
-rw-r--r-- | backends/symbian/S80/ScummVM_S80.mmp.in | 2 | ||||
-rw-r--r-- | backends/symbian/S90/Scummvm_S90.mmp.in | 2 | ||||
-rw-r--r-- | backends/symbian/UIQ2/ScummVM_UIQ2.mmp.in | 2 | ||||
-rw-r--r-- | backends/symbian/UIQ3/ScummVM_UIQ3.mmp.in | 2 | ||||
-rw-r--r-- | backends/symbian/mmp/scummvm_base.mmp.in | 19 | ||||
-rw-r--r-- | backends/symbian/mmp/scummvm_cine.mmp.in | 54 | ||||
-rw-r--r-- | backends/symbian/mmp/scummvm_simon.mmp.in | 1 |
10 files changed, 80 insertions, 7 deletions
diff --git a/backends/symbian/AdaptAllMMPs.pl b/backends/symbian/AdaptAllMMPs.pl index 47c1d2effd..798aa1e363 100644 --- a/backends/symbian/AdaptAllMMPs.pl +++ b/backends/symbian/AdaptAllMMPs.pl @@ -17,7 +17,6 @@ chdir("../../"); "mmp/scummvm_sword2.mmp", "mmp/scummvm_lure.mmp", "mmp/scummvm_cine.mmp", - "S60/ScummVM_S60.mmp", "S60v3/ScummVM_S60v3.mmp", "S80/ScummVM_S80.mmp", diff --git a/backends/symbian/S60/ScummVM_S60.mmp.in b/backends/symbian/S60/ScummVM_S60.mmp.in index 468965fb9f..3421cb306d 100644 --- a/backends/symbian/S60/ScummVM_S60.mmp.in +++ b/backends/symbian/S60/ScummVM_S60.mmp.in @@ -101,4 +101,4 @@ LIBRARY euser.lib apparc.lib fbscli.lib LIBRARY estlib.lib LIBRARY gdi.lib hal.lib bitgdi.lib LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib -library avkon.lib +library avkon.lib bafl.lib diff --git a/backends/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/symbian/S60v3/ScummVM_S60v3.mmp.in index cde28adca4..2b84db43a6 100644 --- a/backends/symbian/S60v3/ScummVM_S60v3.mmp.in +++ b/backends/symbian/S60v3/ScummVM_S60v3.mmp.in @@ -119,4 +119,4 @@ LIBRARY euser.lib apparc.lib fbscli.lib LIBRARY estlib.lib LIBRARY gdi.lib hal.lib bitgdi.lib LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib -library avkon.lib +library avkon.lib bafl.lib diff --git a/backends/symbian/S80/ScummVM_S80.mmp.in b/backends/symbian/S80/ScummVM_S80.mmp.in index 1678714e7f..6074439552 100644 --- a/backends/symbian/S80/ScummVM_S80.mmp.in +++ b/backends/symbian/S80/ScummVM_S80.mmp.in @@ -98,5 +98,5 @@ 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 mediaclientaudiostream.lib efsrv.lib ws32.lib bafl.lib diff --git a/backends/symbian/S90/Scummvm_S90.mmp.in b/backends/symbian/S90/Scummvm_S90.mmp.in index a5edf5ef8b..2655a553a4 100644 --- a/backends/symbian/S90/Scummvm_S90.mmp.in +++ b/backends/symbian/S90/Scummvm_S90.mmp.in @@ -97,6 +97,6 @@ SOURCE gui\Actions.cpp 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 gdi.lib hal.lib bitgdi.lib bafl.lib LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib diff --git a/backends/symbian/UIQ2/ScummVM_UIQ2.mmp.in b/backends/symbian/UIQ2/ScummVM_UIQ2.mmp.in index 4615b64aa1..ef97954935 100644 --- a/backends/symbian/UIQ2/ScummVM_UIQ2.mmp.in +++ b/backends/symbian/UIQ2/ScummVM_UIQ2.mmp.in @@ -98,4 +98,4 @@ LIBRARY euser.lib apparc.lib fbscli.lib LIBRARY estlib.lib apgrfx.lib LIBRARY gdi.lib hal.lib LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib -LIBRARY qikctl.lib +LIBRARY qikctl.lib bafl.lib diff --git a/backends/symbian/UIQ3/ScummVM_UIQ3.mmp.in b/backends/symbian/UIQ3/ScummVM_UIQ3.mmp.in index ca247ee3bd..792e42a568 100644 --- a/backends/symbian/UIQ3/ScummVM_UIQ3.mmp.in +++ b/backends/symbian/UIQ3/ScummVM_UIQ3.mmp.in @@ -122,4 +122,4 @@ LIBRARY estlib.lib apgrfx.lib LIBRARY gdi.lib hal.lib bitgdi.lib LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib LIBRARY qikctl.lib -library qikcore.lib
\ No newline at end of file +library qikcore.lib bafl.lib
\ No newline at end of file diff --git a/backends/symbian/mmp/scummvm_base.mmp.in b/backends/symbian/mmp/scummvm_base.mmp.in index 5fe7e89790..3b9e10c2c3 100644 --- a/backends/symbian/mmp/scummvm_base.mmp.in +++ b/backends/symbian/mmp/scummvm_base.mmp.in @@ -35,6 +35,25 @@ OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way //START_AUTO_MACROS_MASTER// // empty base file, will be updated by Perl build scripts + + // list of possible MACROs: (will be replaced when generating scummvm_base.mmp) + //MACRO USE_ZLIB // LIB:zlib.lib + //MACRO USE_MAD // LIB:libmad.lib + //MACRO USE_TREMOR // LIB:libtremor.lib + //MACRO USE_UIQ_SE_VIBRA // LIB:vibration.lib + //MACRO DISABLE_SCUMM_7_8 + //MACRO DISABLE_SCUMM_HE + //MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib + //MACRO DISABLE_SIMON // LIB:scummvm_simon.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 //STOP_AUTO_MACROS_MASTER// diff --git a/backends/symbian/mmp/scummvm_cine.mmp.in b/backends/symbian/mmp/scummvm_cine.mmp.in new file mode 100644 index 0000000000..8385d93a5a --- /dev/null +++ b/backends/symbian/mmp/scummvm_cine.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-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 CINE +// + +// *** Definitions + +TARGET scummvm_CINE.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\cine + +//START_AUTO_OBJECTS_CINE_// + + // empty base file, will be updated by Perl build scripts + +//STOP_AUTO_OBJECTS_CINE_// + +// *** Include paths + +USERINCLUDE ..\..\..\engines +USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\src +SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\src diff --git a/backends/symbian/mmp/scummvm_simon.mmp.in b/backends/symbian/mmp/scummvm_simon.mmp.in index 616238e82f..4587392b20 100644 --- a/backends/symbian/mmp/scummvm_simon.mmp.in +++ b/backends/symbian/mmp/scummvm_simon.mmp.in @@ -51,4 +51,5 @@ SOURCEPATH ..\..\..\engines\simon 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 |