6 files changed, 67 insertions, 5 deletions
diff --git a/backends/symbian/AdaptAllMMPs.pl b/backends/symbian/AdaptAllMMPs.pl
index 798aa1e363..48b100b2ee 100644
--- a/backends/symbian/AdaptAllMMPs.pl
+++ b/backends/symbian/AdaptAllMMPs.pl
@@ -17,6 +17,7 @@ chdir("../../");
 	"mmp/scummvm_sword2.mmp", 
 	"mmp/scummvm_lure.mmp", 
 	"mmp/scummvm_cine.mmp", 
+	"mmp/scummvm_agi.mmp", 
 	"S60/ScummVM_S60.mmp",  
 	"S60v3/ScummVM_S60v3.mmp", 
 	"S80/ScummVM_S80.mmp", 
@@ -83,7 +84,7 @@ ParseModule("_sword1",	"sword1",	\@section_empty);
 ParseModule("_sword2",	"sword2",	\@section_empty);
 ParseModule("_lure",	"lure",		\@section_empty);
 ParseModule("_cine",	"cine",		\@section_empty);
-
+ParseModule("_agi",	"agi",		\@section_empty);
 print "
 =======================================================================================
 Done. Enjoy :P
diff --git a/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index 71abb9d48e..475b40f0f7 100644
--- a/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -1,7 +1,8 @@
 ;;;
 ;;; ScummVM .PKG file for .SIS gegeration
 ;;;
-
+;Language - standard language definitions
+&EN
 
 ; List of localised vendor names - one per language. At least one must be provided (English [EN]).
 ; List must correspond to list of languages specified elsewhere in the .pkg
@@ -13,7 +14,7 @@
 #{"ScummVM S60v3"},(0xA0000657),0,90,0
 
 ; Platform type
-(0x101F6F88), 0, 0, 0, {"Series60ProductID"}
+[0x101F7961], 0, 0, 0, {"Series60ProductID"}
 
 ; Launcher, Application, AIF & Resource file
 "\s60v3\epoc32\release\gcce\urel\ScummVM.exe"-		"!:\sys\bin\ScummVM.exe"
diff --git a/backends/symbian/UIQ2/ScummVM_UIQ2.mmp.in b/backends/symbian/UIQ2/ScummVM_UIQ2.mmp.in
index ef97954935..9b2e432b19 100644
--- a/backends/symbian/UIQ2/ScummVM_UIQ2.mmp.in
+++ b/backends/symbian/UIQ2/ScummVM_UIQ2.mmp.in
@@ -99,3 +99,8 @@ LIBRARY estlib.lib apgrfx.lib
 LIBRARY gdi.lib hal.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
 LIBRARY qikctl.lib bafl.lib
+
+START WINS
+WIN32_LIBRARY	lldiv.obj llmul.obj llshl.obj
+END
+
diff --git a/backends/symbian/mmp/scummvm_agi.mmp.in b/backends/symbian/mmp/scummvm_agi.mmp.in
new file mode 100644
index 0000000000..8dcc52f05d
--- /dev/null
+++ b/backends/symbian/mmp/scummvm_agi.mmp.in
@@ -0,0 +1,55 @@
+/* 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
+//
+
+// *** Definitions
+
+TARGET          scummvm_agi.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\agi
+
+//START_AUTO_OBJECTS_AGI_//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_AGI_//
+
+// *** Include paths
+
+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
diff --git a/backends/symbian/src/ScummApp.cpp b/backends/symbian/src/ScummApp.cpp
index f750e496fa..0c59f41205 100644
--- a/backends/symbian/src/ScummApp.cpp
+++ b/backends/symbian/src/ScummApp.cpp
@@ -65,7 +65,7 @@ _asm {
 #ifdef EPOC_AS_APP
 
 // this function is called automatically by the SymbianOS to deliver the new CApaApplication object
-#if !defined (UIQ3)
+#if !defined (UIQ3) && !defined (S60V3)
 EXPORT_C 
 #endif
 CApaApplication* NewApplication() {
diff --git a/backends/symbian/src/ScummVm.hrh b/backends/symbian/src/ScummVm.hrh
index 3f7bfc19d6..4966b41e0b 100644
--- a/backends/symbian/src/ScummVm.hrh
+++ b/backends/symbian/src/ScummVm.hrh
@@ -22,7 +22,7 @@
 
 #ifndef ScummHRH
 #define ScummHRH
-#if defined (UIQ3) || defined (__SERIES60_30__)
+#if defined (UIQ3) || defined (S60V3)
 #define ScummUid 0xA0000657
 #else
 #define ScummUid 0x101f9b57