diff options
Diffstat (limited to 'backends/epoc')
-rw-r--r-- | backends/epoc/build/S60/BLD.INF | 1 | ||||
-rw-r--r-- | backends/epoc/build/S60/EScummVM_S60.mmp | 3 | ||||
-rw-r--r-- | backends/epoc/build/S60/EScummVM_S60_EXE.mmp | 26 | ||||
-rw-r--r-- | backends/epoc/build/S80/BLD.INF | 1 | ||||
-rw-r--r-- | backends/epoc/build/S80/EScummVM_S80.mmp | 3 | ||||
-rw-r--r-- | backends/epoc/build/S90/BLD.INF | 1 | ||||
-rw-r--r-- | backends/epoc/build/S90/EScummvm_S90.mmp | 3 | ||||
-rw-r--r-- | backends/epoc/build/UIQ/BLD.INF | 1 | ||||
-rw-r--r-- | backends/epoc/build/UIQ/EScummVM_UIQ.mmp | 3 | ||||
-rw-r--r-- | backends/epoc/build/scummvm_base.mmp | 15 | ||||
-rw-r--r-- | backends/epoc/build/scummvm_saga.mmp | 79 | ||||
-rw-r--r-- | backends/epoc/build/scummvm_scumm.mmp | 4 | ||||
-rw-r--r-- | backends/epoc/build/updateMMPs.pl | 2 |
13 files changed, 129 insertions, 13 deletions
diff --git a/backends/epoc/build/S60/BLD.INF b/backends/epoc/build/S60/BLD.INF index b65f65c7e2..0285a5da5b 100644 --- a/backends/epoc/build/S60/BLD.INF +++ b/backends/epoc/build/S60/BLD.INF @@ -8,6 +8,7 @@ PRJ_MMPFILES ..\scummvm_sky.mmp ..\scummvm_queen.mmp ..\scummvm_gob.mmp +..\scummvm_saga.mmp .\EScummVM_S60.mmp .\EScummVM_S60_App.mmp .\EScummVM_S60_Exe.mmp diff --git a/backends/epoc/build/S60/EScummVM_S60.mmp b/backends/epoc/build/S60/EScummVM_S60.mmp index 143306a72c..b5b3e39d79 100644 --- a/backends/epoc/build/S60/EScummVM_S60.mmp +++ b/backends/epoc/build/S60/EScummVM_S60.mmp @@ -49,7 +49,7 @@ MACRO NONSTANDARD_PORT MACRO DISABLE_SWORD1 MACRO DISABLE_SWORD2 // these are not ready to be released -MACRO DISABLE_SAGA +//MACRO DISABLE_SAGA MACRO DISABLE_KYRA // these work, so don't disable them :) //MACRO DISABLE_SIMON @@ -64,6 +64,7 @@ STATICLIBRARY scummvm_simon.lib STATICLIBRARY scummvm_sky.lib STATICLIBRARY scummvm_queen.lib STATICLIBRARY scummvm_gob.lib +STATICLIBRARY scummvm_saga.lib STATICLIBRARY scummvm_base.lib STATICLIBRARY libmad.lib diff --git a/backends/epoc/build/S60/EScummVM_S60_EXE.mmp b/backends/epoc/build/S60/EScummVM_S60_EXE.mmp index ebb58553bb..f99485a277 100644 --- a/backends/epoc/build/S60/EScummVM_S60_EXE.mmp +++ b/backends/epoc/build/S60/EScummVM_S60_EXE.mmp @@ -1,3 +1,26 @@ +/* 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 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Header$ + */ + // // EPOC S60 MMP makefile project for ScummVM // @@ -27,7 +50,7 @@ MACRO NONSTANDARD_PORT MACRO DISABLE_SWORD1 MACRO DISABLE_SWORD2 // these are not ready to be released -MACRO DISABLE_SAGA +//MACRO DISABLE_SAGA MACRO DISABLE_KYRA // these work, so don't disable them :) //MACRO DISABLE_SIMON @@ -42,6 +65,7 @@ STATICLIBRARY scummvm_simon.lib STATICLIBRARY scummvm_sky.lib STATICLIBRARY scummvm_queen.lib STATICLIBRARY scummvm_gob.lib +STATICLIBRARY scummvm_saga.lib STATICLIBRARY scummvm_base.lib STATICLIBRARY libmad.lib diff --git a/backends/epoc/build/S80/BLD.INF b/backends/epoc/build/S80/BLD.INF index 72207eb096..689c15e80a 100644 --- a/backends/epoc/build/S80/BLD.INF +++ b/backends/epoc/build/S80/BLD.INF @@ -8,5 +8,6 @@ PRJ_MMPFILES ..\scummvm_sky.mmp ..\scummvm_queen.mmp ..\scummvm_gob.mmp +..\scummvm_saga.mmp .\EScummVM_S80.mmp .\EScummVM_S80_App.mmp diff --git a/backends/epoc/build/S80/EScummVM_S80.mmp b/backends/epoc/build/S80/EScummVM_S80.mmp index 3e843ab2cf..b9050f92cd 100644 --- a/backends/epoc/build/S80/EScummVM_S80.mmp +++ b/backends/epoc/build/S80/EScummVM_S80.mmp @@ -49,7 +49,7 @@ MACRO NONSTANDARD_PORT MACRO DISABLE_SWORD1 MACRO DISABLE_SWORD2 // these are not ready to be released -MACRO DISABLE_SAGA +//MACRO DISABLE_SAGA MACRO DISABLE_KYRA // these work, so don't disable them :) //MACRO DISABLE_SIMON @@ -64,6 +64,7 @@ STATICLIBRARY scummvm_simon.lib STATICLIBRARY scummvm_sky.lib STATICLIBRARY scummvm_queen.lib STATICLIBRARY scummvm_gob.lib +STATICLIBRARY scummvm_saga.lib STATICLIBRARY scummvm_base.lib STATICLIBRARY libmad.lib diff --git a/backends/epoc/build/S90/BLD.INF b/backends/epoc/build/S90/BLD.INF index 62c19024cb..add22ac7b3 100644 --- a/backends/epoc/build/S90/BLD.INF +++ b/backends/epoc/build/S90/BLD.INF @@ -8,5 +8,6 @@ PRJ_MMPFILES ..\scummvm_sky.mmp ..\scummvm_queen.mmp ..\scummvm_gob.mmp +..\scummvm_saga.mmp .\EScummVM_S90.mmp .\EScummVM_S90_App.mmp diff --git a/backends/epoc/build/S90/EScummvm_S90.mmp b/backends/epoc/build/S90/EScummvm_S90.mmp index 79d729b2a1..f1ce6190f5 100644 --- a/backends/epoc/build/S90/EScummvm_S90.mmp +++ b/backends/epoc/build/S90/EScummvm_S90.mmp @@ -49,7 +49,7 @@ MACRO NONSTANDARD_PORT MACRO DISABLE_SWORD1 MACRO DISABLE_SWORD2 // these are not ready to be released -MACRO DISABLE_SAGA +//MACRO DISABLE_SAGA MACRO DISABLE_KYRA // these work, so don't disable them :) //MACRO DISABLE_SIMON @@ -64,6 +64,7 @@ STATICLIBRARY scummvm_simon.lib STATICLIBRARY scummvm_sky.lib STATICLIBRARY scummvm_queen.lib STATICLIBRARY scummvm_gob.lib +STATICLIBRARY scummvm_saga.lib STATICLIBRARY scummvm_base.lib STATICLIBRARY libmad.lib diff --git a/backends/epoc/build/UIQ/BLD.INF b/backends/epoc/build/UIQ/BLD.INF index 870189a4d0..458f0c02c8 100644 --- a/backends/epoc/build/UIQ/BLD.INF +++ b/backends/epoc/build/UIQ/BLD.INF @@ -7,6 +7,7 @@ PRJ_MMPFILES ..\scummvm_sky.mmp ..\scummvm_queen.mmp ..\scummvm_gob.mmp +..\scummvm_saga.mmp ..\scummvm_base.mmp .\EScummVM_UIQ.mmp diff --git a/backends/epoc/build/UIQ/EScummVM_UIQ.mmp b/backends/epoc/build/UIQ/EScummVM_UIQ.mmp index fd4acda861..b7e8d0a959 100644 --- a/backends/epoc/build/UIQ/EScummVM_UIQ.mmp +++ b/backends/epoc/build/UIQ/EScummVM_UIQ.mmp @@ -47,7 +47,7 @@ MACRO EPOC_AS_APP MACRO DISABLE_SWORD1 MACRO DISABLE_SWORD2 // these are not ready to be released -MACRO DISABLE_SAGA +//MACRO DISABLE_SAGA MACRO DISABLE_KYRA // these work, so don't disable them, left here because during dev you might wanna turn them off once in a while :) //MACRO DISABLE_SIMON @@ -62,6 +62,7 @@ STATICLIBRARY scummvm_simon.lib STATICLIBRARY scummvm_sky.lib STATICLIBRARY scummvm_queen.lib STATICLIBRARY scummvm_gob.lib +STATICLIBRARY scummvm_saga.lib STATICLIBRARY scummvm_base.lib STATICLIBRARY libmad.lib diff --git a/backends/epoc/build/scummvm_base.mmp b/backends/epoc/build/scummvm_base.mmp index 9fb213935f..bf667ce972 100644 --- a/backends/epoc/build/scummvm_base.mmp +++ b/backends/epoc/build/scummvm_base.mmp @@ -40,7 +40,7 @@ MACRO USE_ZLIB MACRO DISABLE_SWORD1 MACRO DISABLE_SWORD2 // these are not ready to be released -MACRO DISABLE_SAGA +//MACRO DISABLE_SAGA MACRO DISABLE_KYRA // these work, so don't disable them :) //MACRO DISABLE_SIMON @@ -63,7 +63,7 @@ SYSTEMINCLUDE ..\..\..\backends\epoc // for portdefs.h SOURCEPATH ..\..\.. -//START_AUTO_OBJECTS_COMMON_// Updated @ Mon Jun 6 23:07:22 2005 +//START_AUTO_OBJECTS_COMMON_// Updated @ Sun Jul 10 00:52:25 2005 SOURCE common\config-file.cpp SOURCE common\config-manager.cpp SOURCE common\file.cpp @@ -77,7 +77,7 @@ SOURCE common\savefile.cpp SOURCE common\system.cpp //STOP_AUTO_OBJECTS_COMMON_// -//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Mon Jun 6 23:07:22 2005 +//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Sun Jul 10 00:52:25 2005 SOURCE graphics\animation.cpp SOURCE graphics\consolefont.cpp SOURCE graphics\font.cpp @@ -89,7 +89,12 @@ SOURCE graphics\scummfont.cpp SOURCE graphics\surface.cpp //STOP_AUTO_OBJECTS_GRAPHICS_// -//START_AUTO_OBJECTS_GUI_// Updated @ Mon Jun 6 23:07:22 2005 +// these next three will go into gui\modules.mk and will end up in START_AUTO_OBJECTS_GUI +//SOURCE gui\Key.cpp +//SOURCE gui\KeysDialog.cpp +//SOURCE gui\Actions.cpp + +//START_AUTO_OBJECTS_GUI_// Updated @ Sun Jul 10 00:52:25 2005 SOURCE gui\about.cpp SOURCE gui\browser.cpp SOURCE gui\chooser.cpp @@ -108,7 +113,7 @@ SOURCE gui\TabWidget.cpp SOURCE gui\widget.cpp //STOP_AUTO_OBJECTS_GUI_// -//START_AUTO_OBJECTS_SOUND_// Updated @ Mon Jun 6 23:07:22 2005 +//START_AUTO_OBJECTS_SOUND_// Updated @ Sun Jul 10 00:52:25 2005 SOURCE sound\adpcm.cpp SOURCE sound\audiocd.cpp SOURCE sound\audiostream.cpp diff --git a/backends/epoc/build/scummvm_saga.mmp b/backends/epoc/build/scummvm_saga.mmp new file mode 100644 index 0000000000..3fe444425e --- /dev/null +++ b/backends/epoc/build/scummvm_saga.mmp @@ -0,0 +1,79 @@ +/* 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 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Header: + */ + +// +// EPOC MMP makefile project for ScummVM Saga +// + +// *** Definitions + +TARGET scummvm_saga.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 + +MACRO NONSTANDARD_PORT + +// *** SOURCE files + +SOURCEPATH ..\..\.. + +//START_AUTO_OBJECTS_SAGA_// Updated @ Sun Jul 10 00:52:25 2005 +SOURCE saga\actor.cpp +SOURCE saga\animation.cpp +SOURCE saga\console.cpp +SOURCE saga\events.cpp +SOURCE saga\font.cpp +SOURCE saga\font_map.cpp +SOURCE saga\game.cpp +SOURCE saga\gfx.cpp +SOURCE saga\ihnm_introproc.cpp +SOURCE saga\image.cpp +SOURCE saga\interface.cpp +SOURCE saga\isomap.cpp +SOURCE saga\ite_introproc.cpp +SOURCE saga\itedata.cpp +SOURCE saga\objectmap.cpp +SOURCE saga\puzzle.cpp +SOURCE saga\palanim.cpp +SOURCE saga\render.cpp +SOURCE saga\rscfile.cpp +SOURCE saga\saga.cpp +SOURCE saga\saveload.cpp +SOURCE saga\scene.cpp +SOURCE saga\script.cpp +SOURCE saga\sfuncs.cpp +SOURCE saga\sndres.cpp +SOURCE saga\sprite.cpp +SOURCE saga\sthread.cpp +SOURCE saga\text.cpp +SOURCE saga\input.cpp +SOURCE saga\music.cpp +SOURCE saga\sound.cpp +//STOP_AUTO_OBJECTS_SAGA_// + +// *** Include paths + +USERINCLUDE ..\..\..\saga +USERINCLUDE ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\..\..\backends\epoc +SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\..\..\backends\epoc diff --git a/backends/epoc/build/scummvm_scumm.mmp b/backends/epoc/build/scummvm_scumm.mmp index 9760985f2a..cd200e7836 100644 --- a/backends/epoc/build/scummvm_scumm.mmp +++ b/backends/epoc/build/scummvm_scumm.mmp @@ -41,7 +41,7 @@ MACRO USE_ZLIB SOURCEPATH ..\..\.. -//START_AUTO_OBJECTS_SCUMM_// Updated @ Mon Jun 6 23:07:22 2005 +//START_AUTO_OBJECTS_SCUMM_// Updated @ Sun Jul 10 00:52:25 2005 SOURCE scumm\actor.cpp SOURCE scumm\akos.cpp SOURCE scumm\base-costume.cpp @@ -61,7 +61,6 @@ SOURCE scumm\instrument.cpp SOURCE scumm\help.cpp SOURCE scumm\midiparser_ro.cpp SOURCE scumm\midiparser_eup.cpp -SOURCE scumm\nut_renderer.cpp SOURCE scumm\object.cpp SOURCE scumm\palette.cpp SOURCE scumm\player_mod.cpp @@ -94,6 +93,7 @@ SOURCE scumm\thumbnail.cpp //START_AUTO_OBJECTS_SCUMM_DISABLE_SCUMM_7_8// Updated @ Mon Jun 6 23:03:34 2005 SOURCE scumm\script_v8.cpp +SOURCE scumm\nut_renderer.cpp SOURCE scumm\imuse_digi\dimuse.cpp SOURCE scumm\imuse_digi\dimuse_bndmgr.cpp SOURCE scumm\imuse_digi\dimuse_codecs.cpp diff --git a/backends/epoc/build/updateMMPs.pl b/backends/epoc/build/updateMMPs.pl index fc7108c3e6..648821889c 100644 --- a/backends/epoc/build/updateMMPs.pl +++ b/backends/epoc/build/updateMMPs.pl @@ -27,7 +27,7 @@ ParseModule("_queen", "queen", \@std); ParseModule("_simon", "simon", \@std); ParseModule("_sky", "sky", \@std); ParseModule("_gob", "gob", \@std); - +ParseModule("_saga", "saga", \@std); print " ======================================================================================= Done. Enjoy :P |