Updated MMP files after the latest projekt (mk) files. Added stub zip for tremor and added Kyra mmp file.

svn-id: r18905

13 files changed, 86 insertions, 20 deletions

diff --git a/backends/epoc/build/S60/EScummVM_S60_EXE.mmp b/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
index bbb6d4f7fa..08113889d8 100644
--- a/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
+++ b/backends/epoc/build/S60/EScummVM_S60_EXE.mmp
@@ -43,7 +43,7 @@ EPOCHEAPSIZE	1024	8192000
 
 MACRO			S60
 
-//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
diff --git a/backends/epoc/build/S80/EScummVM_S80.mmp b/backends/epoc/build/S80/EScummVM_S80.mmp
index 4ebed7289e..0b7007e5a4 100644
--- a/backends/epoc/build/S80/EScummVM_S80.mmp
+++ b/backends/epoc/build/S80/EScummVM_S80.mmp
@@ -43,7 +43,7 @@ EPOCHEAPSIZE	1024	8192000
 
 MACRO			S80
 
-//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
diff --git a/backends/epoc/build/S90/EScummvm_S90.mmp b/backends/epoc/build/S90/EScummvm_S90.mmp
index 2d1c00341f..57e9640328 100644
--- a/backends/epoc/build/S90/EScummvm_S90.mmp
+++ b/backends/epoc/build/S90/EScummvm_S90.mmp
@@ -43,7 +43,7 @@ EPOCHEAPSIZE	1024	8192000
 
 MACRO			S90
 
-//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
diff --git a/backends/epoc/build/UIQ/EScummVM_UIQ.mmp b/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
index 5e59e85a8b..2aad3cd894 100644
--- a/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
+++ b/backends/epoc/build/UIQ/EScummVM_UIQ.mmp
@@ -42,7 +42,7 @@ UID             0x100039ce 0x101f9b57
 MACRO			UIQ
 MACRO			EPOC_AS_APP
 
-//START_AUTO_MACROS_SLAVE// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
diff --git a/backends/epoc/build/epoc-tremor.zip b/backends/epoc/build/epoc-tremor.zip
new file mode 100644
index 0000000000..2ad4fcfb43
--- /dev/null
+++ b/backends/epoc/build/epoc-tremor.zip
diff --git a/backends/epoc/build/scummvm_base.mmp b/backends/epoc/build/scummvm_base.mmp
index c3549b3ea6..1562757fa3 100644
--- a/backends/epoc/build/scummvm_base.mmp
+++ b/backends/epoc/build/scummvm_base.mmp
@@ -69,7 +69,7 @@ SYSTEMINCLUDE   ..\..\..\backends\epoc // for portdefs.h
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_COMMON_// Updated @ Sat Sep 17 16:14:29 2005
+//START_AUTO_OBJECTS_COMMON_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE common\config-file.cpp
 SOURCE common\config-manager.cpp
 SOURCE common\file.cpp
@@ -81,13 +81,16 @@ SOURCE common\timer.cpp
 SOURCE common\util.cpp
 SOURCE common\savefile.cpp
 SOURCE common\system.cpp
+SOURCE common\scaler.cpp
+SOURCE common\scaler\thumbnail.cpp
 //STOP_AUTO_OBJECTS_COMMON_//
 
-//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Sat Sep 17 16:14:29 2005
+//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE graphics\animation.cpp
 SOURCE graphics\consolefont.cpp
 SOURCE graphics\font.cpp
 SOURCE graphics\fontman.cpp
+SOURCE graphics\ilbm.cpp
 SOURCE graphics\newfont.cpp
 SOURCE graphics\newfont_big.cpp
 SOURCE graphics\primitives.cpp
@@ -101,7 +104,7 @@ SOURCE graphics\surface.cpp
 //SOURCE gui\KeysDialog.cpp
 //SOURCE gui\Actions.cpp
 
-//START_AUTO_OBJECTS_GUI_// Updated @ Sat Sep 17 16:14:29 2005
+//START_AUTO_OBJECTS_GUI_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE gui\about.cpp
 SOURCE gui\browser.cpp
 SOURCE gui\chooser.cpp
@@ -120,7 +123,7 @@ SOURCE gui\TabWidget.cpp
 SOURCE gui\widget.cpp
 //STOP_AUTO_OBJECTS_GUI_//
 
-//START_AUTO_OBJECTS_SOUND_// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_OBJECTS_SOUND_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE sound\adpcm.cpp
 SOURCE sound\audiocd.cpp
 SOURCE sound\audiostream.cpp
diff --git a/backends/epoc/build/scummvm_gob.mmp b/backends/epoc/build/scummvm_gob.mmp
index d3cba071cf..ec83aa7337 100644
--- a/backends/epoc/build/scummvm_gob.mmp
+++ b/backends/epoc/build/scummvm_gob.mmp
@@ -32,7 +32,7 @@ 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// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
@@ -45,7 +45,7 @@ MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_GOB_// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_OBJECTS_GOB_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE gob\anim.cpp
 SOURCE gob\cdrom.cpp
 SOURCE gob\dataio.cpp
diff --git a/backends/epoc/build/scummvm_kyra.mmp b/backends/epoc/build/scummvm_kyra.mmp
new file mode 100644
index 0000000000..ba6cc6a48f
--- /dev/null
+++ b/backends/epoc/build/scummvm_kyra.mmp
@@ -0,0 +1,63 @@
+/* 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 Kyra
+//
+
+// *** Definitions
+
+TARGET          scummvm_kyra.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// Updated @ Fri Sep 30 14:01:53 2005
+MACRO			NONSTANDARD_PORT
+MACRO			USE_MAD				// LIB:libmad.lib
+MACRO			USE_ZLIB			// LIB:zlib.lib
+MACRO			DISABLE_SWORD1
+MACRO			DISABLE_SWORD2
+MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
+//STOP_AUTO_MACROS_SLAVE//
+
+// *** SOURCE files
+
+SOURCEPATH ..\..\..
+
+//START_AUTO_OBJECTS_KYRA_// Updated @ Fri Sep 30 14:01:53 2005
+SOURCE kyra\kyra.cpp
+SOURCE kyra\resource.cpp
+SOURCE kyra\screen.cpp
+SOURCE kyra\script_v1.cpp
+SOURCE kyra\script.cpp
+SOURCE kyra\sound.cpp
+SOURCE kyra\staticres.cpp
+SOURCE kyra\wsamovie.cpp
+//STOP_AUTO_OBJECTS_KYRA_//
+
+// *** Include paths
+
+USERINCLUDE     ..\..\..\kyra
+USERINCLUDE     ..\..\.. ..\..\..\common ..\..\..\gui ..\..\..\sound ..\..\..\backends\epoc
+SYSTEMINCLUDE   \epoc32\include \epoc32\include\libc ..\..\..\backends\epoc
diff --git a/backends/epoc/build/scummvm_queen.mmp b/backends/epoc/build/scummvm_queen.mmp
index 22e0df712e..f9fa828dd3 100644
--- a/backends/epoc/build/scummvm_queen.mmp
+++ b/backends/epoc/build/scummvm_queen.mmp
@@ -32,7 +32,7 @@ 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// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
@@ -45,7 +45,7 @@ MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_QUEEN_// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_OBJECTS_QUEEN_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE queen\bankman.cpp
 SOURCE queen\command.cpp
 SOURCE queen\credits.cpp
diff --git a/backends/epoc/build/scummvm_saga.mmp b/backends/epoc/build/scummvm_saga.mmp
index 899cc7ec5b..a06d5b26e0 100644
--- a/backends/epoc/build/scummvm_saga.mmp
+++ b/backends/epoc/build/scummvm_saga.mmp
@@ -32,7 +32,7 @@ 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// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
@@ -45,7 +45,7 @@ MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_SAGA_// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_OBJECTS_SAGA_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE saga\actor.cpp
 SOURCE saga\animation.cpp
 SOURCE saga\console.cpp
diff --git a/backends/epoc/build/scummvm_scumm.mmp b/backends/epoc/build/scummvm_scumm.mmp
index 727a9d8141..62f2d0693d 100644
--- a/backends/epoc/build/scummvm_scumm.mmp
+++ b/backends/epoc/build/scummvm_scumm.mmp
@@ -32,7 +32,7 @@ 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// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
@@ -45,7 +45,7 @@ MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_SCUMM_// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_OBJECTS_SCUMM_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE scumm\actor.cpp
 SOURCE scumm\akos.cpp
 SOURCE scumm\base-costume.cpp
diff --git a/backends/epoc/build/scummvm_simon.mmp b/backends/epoc/build/scummvm_simon.mmp
index 123ab46397..2549eb2591 100644
--- a/backends/epoc/build/scummvm_simon.mmp
+++ b/backends/epoc/build/scummvm_simon.mmp
@@ -32,7 +32,7 @@ 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// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
@@ -45,7 +45,7 @@ MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_SIMON_// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_OBJECTS_SIMON_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE simon\charset.cpp
 SOURCE simon\cursor.cpp
 SOURCE simon\debug.cpp
diff --git a/backends/epoc/build/scummvm_sky.mmp b/backends/epoc/build/scummvm_sky.mmp
index 36bc6dc74d..4cd87b2005 100644
--- a/backends/epoc/build/scummvm_sky.mmp
+++ b/backends/epoc/build/scummvm_sky.mmp
@@ -32,7 +32,7 @@ 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// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_MACROS_SLAVE// Updated @ Fri Sep 30 14:01:53 2005
 MACRO			NONSTANDARD_PORT
 MACRO			USE_MAD				// LIB:libmad.lib
 MACRO			USE_ZLIB			// LIB:zlib.lib
@@ -45,7 +45,7 @@ MACRO			DISABLE_KYRA		// LIB:scummvm_kyra.lib
 
 SOURCEPATH ..\..\..
 
-//START_AUTO_OBJECTS_SKY_// Updated @ Sat Sep 17 16:14:30 2005
+//START_AUTO_OBJECTS_SKY_// Updated @ Fri Sep 30 14:01:53 2005
 SOURCE sky\autoroute.cpp
 SOURCE sky\compact.cpp
 SOURCE sky\control.cpp