From 08f7d0ac1abbc7576b194bc08afbbe23d1805d4d Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Mon, 2 Feb 2009 19:31:35 +0000
Subject: Missed script update for future SAGA2 engine

svn-id: r36204
---
 backends/platform/symbian/AdaptAllMMPs.pl                    |  3 ++-
 backends/platform/symbian/S60v3/BLD.INF.in                   |  1 +
 .../platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in     |  2 +-
 backends/platform/symbian/UIQ3/BLD.INF.in                    |  2 +-
 backends/platform/symbian/mmp/scummvm_base.mmp.in            |  1 -
 backends/platform/symbian/mmp/scummvm_saga.mmp.in            | 12 ++++++++++++
 backends/platform/symbian/src/ScummVm.hrh                    |  4 ++++
 7 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'backends')

diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index 9d843d80b9..c0be1369ff 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -66,6 +66,7 @@ Preparing to update all the Symbian MMP project files with objects from module.m
 # some modules.mk files have #ifndef ENABLE_XXXX blocks:
 my @section_empty = (""); # section standard: no #ifdef's in module.mk files
 my @sections_scumm = ("", "ENABLE_SCUMM_7_8", "ENABLE_HE"); # special sections for engine SCUMM
+my @sections_saga = ("", "ENABLE_IHNM", "ENABLE_SAGA2"); # special sections for engine SAGA
 
 
 # files excluded from build, case insensitive, will be matched in filename string only
@@ -111,7 +112,7 @@ ParseModule("_queen",	"queen",	\@section_empty);
 ParseModule("_agos",	"agos",		\@section_empty);
 ParseModule("_sky",	"sky",		\@section_empty);
 ParseModule("_gob",	"gob",		\@section_empty);
-ParseModule("_saga",	"saga",		\@section_empty);
+ParseModule("_saga",	"saga",		\@sections_saga);
 ParseModule("_kyra",	"kyra",		\@section_empty);
 ParseModule("_sword1",	"sword1",	\@section_empty);
 ParseModule("_sword2",	"sword2",	\@section_empty);
diff --git a/backends/platform/symbian/S60v3/BLD.INF.in b/backends/platform/symbian/S60v3/BLD.INF.in
index d499fccc39..10f46ced61 100644
--- a/backends/platform/symbian/S60v3/BLD.INF.in
+++ b/backends/platform/symbian/S60v3/BLD.INF.in
@@ -8,4 +8,5 @@ PRJ_MMPFILES
 	
 //STOP_AUTO_PROJECTS//
 gnumakefile icons.mk
+.\ScummVM_A0000658_S60v3.mmp
 .\ScummVM_S60v3.mmp
diff --git a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
index 5b77ca83af..52cc859684 100644
--- a/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
@@ -68,7 +68,7 @@ END
 
 MACRO			S60
 MACRO			S60V3
-
+MACRO			SECOND_EXE
 ALWAYS_BUILD_AS_ARM
 
 //START_AUTO_MACROS_SLAVE//
diff --git a/backends/platform/symbian/UIQ3/BLD.INF.in b/backends/platform/symbian/UIQ3/BLD.INF.in
index 9782901d6a..3f98c7516d 100644
--- a/backends/platform/symbian/UIQ3/BLD.INF.in
+++ b/backends/platform/symbian/UIQ3/BLD.INF.in
@@ -7,5 +7,5 @@ PRJ_MMPFILES
 	// empty base file, will be updated by Perl build scripts
 	
 //STOP_AUTO_PROJECTS//
-
+.\ScummVM_A0000658_UIQ3.mmp
 .\ScummVM_UIQ3.mmp
diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in
index 9e4d60e951..7d79a924e7 100644
--- a/backends/platform/symbian/mmp/scummvm_base.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in
@@ -105,7 +105,6 @@ SOURCE	   backends\events\default\default-events.cpp
 SOURCE	   backends\timer\default\default-timer.cpp
 SOURCE	   backends\saves\savefile.cpp
 SOURCE	   backends\saves\default\default-saves.cpp
-SOURCE	   backends\saves\compressed\compressed-saves.cpp
 SOURCE	   engines\engine.cpp
 SOURCE	   engines\dialogs.cpp
 SOURCE	   engines\game.cpp
diff --git a/backends/platform/symbian/mmp/scummvm_saga.mmp.in b/backends/platform/symbian/mmp/scummvm_saga.mmp.in
index c040de250c..f101ab2d90 100644
--- a/backends/platform/symbian/mmp/scummvm_saga.mmp.in
+++ b/backends/platform/symbian/mmp/scummvm_saga.mmp.in
@@ -49,6 +49,18 @@ SOURCEPATH ..\..\..\..\engines\saga
 
 //STOP_AUTO_OBJECTS_SAGA_//
 
+//START_AUTO_OBJECTS_SAGA_ENABLE_IHNM//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_SAGA_ENABLE_IHNM//
+
+//START_AUTO_OBJECTS_SAGA_ENABLE_SAGA2//
+
+	// empty base file, will be updated by Perl build scripts
+
+//STOP_AUTO_OBJECTS_SAGA_ENABLE_SAGA2//
+
 // *** Include paths
 
 USERINCLUDE     ..\..\..\..\engines
diff --git a/backends/platform/symbian/src/ScummVm.hrh b/backends/platform/symbian/src/ScummVm.hrh
index 4966b41e0b..f18243ed54 100644
--- a/backends/platform/symbian/src/ScummVm.hrh
+++ b/backends/platform/symbian/src/ScummVm.hrh
@@ -23,7 +23,11 @@
 #ifndef ScummHRH
 #define ScummHRH
 #if defined (UIQ3) || defined (S60V3)
+#ifdef SECOND_EXE
+#define ScummUid 0xA0000658
+#else
 #define ScummUid 0xA0000657
+#endif
 #else
 #define ScummUid 0x101f9b57
 #endif
-- 
cgit v1.2.3