[Scummvm-cvs-logs] SF.net SVN: scummvm:[36204] scummvm/trunk/backends/platform/symbian

anotherguest at users.sourceforge.net anotherguest at users.sourceforge.net
Mon Feb 2 20:31:35 CET 2009


Revision: 36204
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36204&view=rev
Author:   anotherguest
Date:     2009-02-02 19:31:35 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
Missed script update for future SAGA2 engine

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
    scummvm/trunk/backends/platform/symbian/S60v3/BLD.INF.in
    scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
    scummvm/trunk/backends/platform/symbian/UIQ3/BLD.INF.in
    scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
    scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in
    scummvm/trunk/backends/platform/symbian/src/ScummVm.hrh

Modified: scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
===================================================================
--- scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl	2009-02-02 19:29:05 UTC (rev 36203)
+++ scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl	2009-02-02 19:31:35 UTC (rev 36204)
@@ -66,6 +66,7 @@
 # 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("_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);

Modified: scummvm/trunk/backends/platform/symbian/S60v3/BLD.INF.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/BLD.INF.in	2009-02-02 19:29:05 UTC (rev 36203)
+++ scummvm/trunk/backends/platform/symbian/S60v3/BLD.INF.in	2009-02-02 19:31:35 UTC (rev 36204)
@@ -8,4 +8,5 @@
 	
 //STOP_AUTO_PROJECTS//
 gnumakefile icons.mk
+.\ScummVM_A0000658_S60v3.mmp
 .\ScummVM_S60v3.mmp

Modified: scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in	2009-02-02 19:29:05 UTC (rev 36203)
+++ scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_A0000658_S60v3.mmp.in	2009-02-02 19:31:35 UTC (rev 36204)
@@ -68,7 +68,7 @@
 
 MACRO			S60
 MACRO			S60V3
-
+MACRO			SECOND_EXE
 ALWAYS_BUILD_AS_ARM
 
 //START_AUTO_MACROS_SLAVE//

Modified: scummvm/trunk/backends/platform/symbian/UIQ3/BLD.INF.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/BLD.INF.in	2009-02-02 19:29:05 UTC (rev 36203)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/BLD.INF.in	2009-02-02 19:31:35 UTC (rev 36204)
@@ -7,5 +7,5 @@
 	// empty base file, will be updated by Perl build scripts
 	
 //STOP_AUTO_PROJECTS//
-
+.\ScummVM_A0000658_UIQ3.mmp
 .\ScummVM_UIQ3.mmp

Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in	2009-02-02 19:29:05 UTC (rev 36203)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in	2009-02-02 19:31:35 UTC (rev 36204)
@@ -105,7 +105,6 @@
 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

Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in	2009-02-02 19:29:05 UTC (rev 36203)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in	2009-02-02 19:31:35 UTC (rev 36204)
@@ -49,6 +49,18 @@
 
 //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

Modified: scummvm/trunk/backends/platform/symbian/src/ScummVm.hrh
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/ScummVm.hrh	2009-02-02 19:29:05 UTC (rev 36203)
+++ scummvm/trunk/backends/platform/symbian/src/ScummVm.hrh	2009-02-02 19:31:35 UTC (rev 36204)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list