[Scummvm-cvs-logs] CVS: scummvm/backends/epoc/build scummvm_base.mmp,1.3,1.4 scummvm_gob.mmp,1.1,1.2 scummvm_queen.mmp,1.1,1.2 scummvm_saga.mmp,1.1,1.2 scummvm_scumm.mmp,1.2,1.3 scummvm_simon.mmp,1.1,1.2 scummvm_sky.mmp,1.1,1.2 updateMMPs.pl,1.2,1.3
Lars Persson
anotherguest at users.sourceforge.net
Fri Sep 30 04:59:04 CEST 2005
Update of /cvsroot/scummvm/scummvm/backends/epoc/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27621/backends/epoc/build
Modified Files:
scummvm_base.mmp scummvm_gob.mmp scummvm_queen.mmp
scummvm_saga.mmp scummvm_scumm.mmp scummvm_simon.mmp
scummvm_sky.mmp updateMMPs.pl
Log Message:
Updated symbian actions and build scripts. Run updateMMPs to updated all MMPS based on the base mmp
Index: scummvm_base.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/scummvm_base.mmp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scummvm_base.mmp 9 Jul 2005 23:25:45 -0000 1.3
+++ scummvm_base.mmp 30 Sep 2005 11:57:37 -0000 1.4
@@ -32,21 +32,26 @@
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
+// Note: the LIB:*.lib statements are used by updateMMPs.pl, so don't remove them!
+//START_AUTO_MACROS_MASTER//
MACRO NONSTANDARD_PORT
-MACRO USE_MAD
-MACRO USE_ZLIB
-
+MACRO USE_MAD // LIB:libmad.lib
+MACRO USE_ZLIB // LIB:zlib.lib
+//MACRO USE_TREMOR // LIB:libtremor.lib
+//MACRO USE_VORBIS
// these need too high a resolution
MACRO DISABLE_SWORD1
MACRO DISABLE_SWORD2
// these are not ready to be released
-//MACRO DISABLE_SAGA
-MACRO DISABLE_KYRA
-// these work, so don't disable them :)
-//MACRO DISABLE_SIMON
-//MACRO DISABLE_SKY
-//MACRO DISABLE_QUEEN
-//MACRO DISABLE_GOB
+MACRO DISABLE_KYRA // LIB:scummvm_kyra.lib
+// these work, so don't disable them, left here because during dev you might wanna turn them off once in a while :)
+//MACRO DISABLE_SCUMM // LIB:scummvm_scumm.lib
+//MACRO DISABLE_SIMON // LIB:scummvm_simon.lib
+//MACRO DISABLE_SKY // LIB:scummvm_sky.lib
+//MACRO DISABLE_QUEEN // LIB:scummvm_queen.lib
+//MACRO DISABLE_GOB // LIB:scummvm_gob.lib
+//MACRO DISABLE_SAGA // LIB:scummvm_saga.lib
+//STOP_AUTO_MACROS_MASTER//
// *** Include paths
@@ -56,6 +61,7 @@
SYSTEMINCLUDE \epoc32\include\ESDL
SYSTEMINCLUDE \epoc32\include\ZLIB // before \epoc32\include because symbian already has older version
SYSTEMINCLUDE \epoc32\include\libc
+//SYSTEMINCLUDE \epoc32\include\tremor -- don't need this: refs are direct: "tremor/includexx.h"
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE ..\..\..\backends\epoc // for portdefs.h
@@ -63,7 +69,7 @@
SOURCEPATH ..\..\..
-//START_AUTO_OBJECTS_COMMON_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_COMMON_// Updated @ Sat Sep 17 16:14:29 2005
SOURCE common\config-file.cpp
SOURCE common\config-manager.cpp
SOURCE common\file.cpp
@@ -77,7 +83,7 @@
SOURCE common\system.cpp
//STOP_AUTO_OBJECTS_COMMON_//
-//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_GRAPHICS_// Updated @ Sat Sep 17 16:14:29 2005
SOURCE graphics\animation.cpp
SOURCE graphics\consolefont.cpp
SOURCE graphics\font.cpp
@@ -90,11 +96,12 @@
//STOP_AUTO_OBJECTS_GRAPHICS_//
// these next three will go into gui\modules.mk and will end up in START_AUTO_OBJECTS_GUI
+// for now they are in the phone platform specific MMP files because of library dependency probs
//SOURCE gui\Key.cpp
//SOURCE gui\KeysDialog.cpp
//SOURCE gui\Actions.cpp
-//START_AUTO_OBJECTS_GUI_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_GUI_// Updated @ Sat Sep 17 16:14:29 2005
SOURCE gui\about.cpp
SOURCE gui\browser.cpp
SOURCE gui\chooser.cpp
@@ -113,7 +120,7 @@
SOURCE gui\widget.cpp
//STOP_AUTO_OBJECTS_GUI_//
-//START_AUTO_OBJECTS_SOUND_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_SOUND_// Updated @ Sat Sep 17 16:14:30 2005
SOURCE sound\adpcm.cpp
SOURCE sound\audiocd.cpp
SOURCE sound\audiostream.cpp
Index: scummvm_gob.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/scummvm_gob.mmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scummvm_gob.mmp 21 Jun 2005 20:19:39 -0000 1.1
+++ scummvm_gob.mmp 30 Sep 2005 11:57:37 -0000 1.2
@@ -32,13 +32,20 @@
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
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_GOB_// Updated @ Mon Jun 6 23:07:22 2005
+//START_AUTO_OBJECTS_GOB_// Updated @ Sat Sep 17 16:14:30 2005
SOURCE gob\anim.cpp
SOURCE gob\cdrom.cpp
SOURCE gob\dataio.cpp
Index: scummvm_queen.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/scummvm_queen.mmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scummvm_queen.mmp 21 Jun 2005 20:19:39 -0000 1.1
+++ scummvm_queen.mmp 30 Sep 2005 11:57:37 -0000 1.2
@@ -32,14 +32,20 @@
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
MACRO NONSTANDARD_PORT
-MACRO USE_MAD
+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_QUEEN_// Updated @ Mon Jun 6 23:07:22 2005
+//START_AUTO_OBJECTS_QUEEN_// Updated @ Sat Sep 17 16:14:30 2005
SOURCE queen\bankman.cpp
SOURCE queen\command.cpp
SOURCE queen\credits.cpp
Index: scummvm_saga.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/scummvm_saga.mmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scummvm_saga.mmp 9 Jul 2005 23:25:45 -0000 1.1
+++ scummvm_saga.mmp 30 Sep 2005 11:57:37 -0000 1.2
@@ -32,13 +32,20 @@
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
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_SAGA_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_SAGA_// Updated @ Sat Sep 17 16:14:30 2005
SOURCE saga\actor.cpp
SOURCE saga\animation.cpp
SOURCE saga\console.cpp
@@ -66,7 +73,6 @@
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
Index: scummvm_scumm.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/scummvm_scumm.mmp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scummvm_scumm.mmp 9 Jul 2005 23:25:45 -0000 1.2
+++ scummvm_scumm.mmp 30 Sep 2005 11:57:37 -0000 1.3
@@ -21,7 +21,6 @@
* $Header:
*/
-
//
// EPOC MMP makefile project for ScummVM
//
@@ -33,15 +32,20 @@
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
MACRO NONSTANDARD_PORT
-MACRO USE_MAD
-MACRO USE_ZLIB
+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_SCUMM_// Updated @ Sun Jul 10 00:52:25 2005
+//START_AUTO_OBJECTS_SCUMM_// Updated @ Sat Sep 17 16:14:30 2005
SOURCE scumm\actor.cpp
SOURCE scumm\akos.cpp
SOURCE scumm\base-costume.cpp
Index: scummvm_simon.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/scummvm_simon.mmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scummvm_simon.mmp 21 Jun 2005 20:19:39 -0000 1.1
+++ scummvm_simon.mmp 30 Sep 2005 11:57:37 -0000 1.2
@@ -21,7 +21,6 @@
* $Header:
*/
-
//
// EPOC MMP makefile project for ScummVM
//
@@ -33,14 +32,20 @@
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
MACRO NONSTANDARD_PORT
-MACRO USE_MAD
+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_SIMON_// Updated @ Mon Jun 6 23:07:22 2005
+//START_AUTO_OBJECTS_SIMON_// Updated @ Sat Sep 17 16:14:30 2005
SOURCE simon\charset.cpp
SOURCE simon\cursor.cpp
SOURCE simon\debug.cpp
Index: scummvm_sky.mmp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/scummvm_sky.mmp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scummvm_sky.mmp 21 Jun 2005 20:19:39 -0000 1.1
+++ scummvm_sky.mmp 30 Sep 2005 11:57:37 -0000 1.2
@@ -21,7 +21,6 @@
* $Header:
*/
-
//
// EPOC MMP makefile project for ScummVM
//
@@ -33,14 +32,20 @@
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
MACRO NONSTANDARD_PORT
-MACRO USE_MAD
+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_SKY_// Updated @ Mon Jun 6 23:07:22 2005
+//START_AUTO_OBJECTS_SKY_// Updated @ Sat Sep 17 16:14:30 2005
SOURCE sky\autoroute.cpp
SOURCE sky\compact.cpp
SOURCE sky\control.cpp
Index: updateMMPs.pl
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/epoc/build/updateMMPs.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- updateMMPs.pl 9 Jul 2005 23:25:45 -0000 1.2
+++ updateMMPs.pl 30 Sep 2005 11:57:37 -0000 1.3
@@ -12,27 +12,44 @@
chdir("../../../");
my @std = (""); # section standard, no #ifdef
-#my @sec = ("", "DISABLE_SCUMM_7_8", "DISABLE_HE"); # sections for scumm DISABLED_s
my @exc = ("mt32","fluidsynth"); # exclusions for sound
-#arseModule(mmpStr, dirStr, ifdefArray, [exclusionsArray])
-#ParseModule("_base", "base", \@std); # now in EScummVM_TRG.mmp, these never change anyways...
+#arseModule(mmpStr, dirStr, ifdefArray, [exclusionsArray])
+#ParseModule("_base", "base", \@std); # now in ./TRG/EScummVM_TRG.mmp, these never change anyways...
ParseModule("_base", "common", \@std);
ParseModule("_base", "gui", \@std);
ParseModule("_base", "graphics", \@std);
ParseModule("_base", "sound", \@std, \@exc);
-ParseModule("_scumm", "scumm", \@std); #\@sec # no more: enabled all again
+ParseModule("_scumm", "scumm", \@std);
ParseModule("_queen", "queen", \@std);
ParseModule("_simon", "simon", \@std);
ParseModule("_sky", "sky", \@std);
ParseModule("_gob", "gob", \@std);
-ParseModule("_saga", "saga", \@std);
+ParseModule("_saga", "saga", \@std);
+ParseModule("_kyra", "kyra", \@std);
+
+print "
+=======================================================================================
+Updating slave MACRO settings in MMP files from master 'scummvm_base.mmp'
+=======================================================================================
+
+";
+
+ at mmp_files = ( "scummvm_scumm.mmp", "scummvm_queen.mmp", "scummvm_simon.mmp", "scummvm_sky.mmp", "scummvm_gob.mmp", "scummvm_saga.mmp", "scummvm_kyra.mmp",
+ "UIQ/EScummVM_UIQ.mmp", "S60/EScummVM_S60_EXE.mmp", "S80/EScummVM_S80.mmp", "S90/EScummVM_S90.mmp");
+
+UpdateSlaveMacros();
+
print "
=======================================================================================
Done. Enjoy :P
=======================================================================================
";
+
+##################################################################################################################
+##################################################################################################################
+
# parses multiple sections per mmp/module
sub ParseModule
{
@@ -47,6 +64,8 @@
}
}
+##################################################################################################################
+
# parses all module.mk files in a dir and its subdirs
sub CheckForModuleMK
{
@@ -120,6 +139,8 @@
}
}
+##################################################################################################################
+
# update an MMP project file with the new objects
sub UpdateProjectFile
{
@@ -137,10 +158,6 @@
my @lines = <FILE>;
close FILE;
-# open FILE, ">$file~";
-# print FILE @lines;
-# close FILE;
-
my $onestr = join("", at lines);
$onestr =~ s/$a.*$b/$a$updated\n$output$b/s;
@@ -152,5 +169,88 @@
$output = "";
}
+
+##################################################################################################################
+
+sub UpdateSlaveMacros
+{
+ my $updated = " Updated @ ".localtime();
+
+ my $name = "scummvm_base.mmp";
+ my $file = "$buildDir/$name";
+ print "Reading master MACROS from backends/epoc/build/$name ... ";
+
+ open FILE, "$file";
+ my @lines = <FILE>;
+ close FILE;
+ my $onestr = join("", at lines);
+
+ my $n = "AUTO_MACROS_MASTER";
+ my $a = "\/\/START_$n\/\/";
+ my $b = "\/\/STOP_$n\/\/";
+ $onestr =~ /$a(.*)$b/s;
+ my $macros = $1;
-
\ No newline at end of file
+ my $libs = "\n// automagically enabled static libs from macros above\n";
+ my $libZ = "STATICLIBRARY scummvm_base.lib // must be above USE_* .libs\n";
+ my $macro_counter = 0;
+ my $macros2 = "\n"; # output
+
+ foreach $line (split("\n", $macros))
+ {
+ # do we need to add a static .lib?
+ if ($line =~ /^.*MACRO\s*([A-Z_]*)\s*\/\/\s*LIB\:(.*)$/)
+ {
+ my $macro = $1; my $lib = $2;
+
+ # this macro enabled? then also add the .lib
+ if ($line =~ /^\s*MACRO\s*$macro/m)
+ {
+ $libZ .= "STATICLIBRARY $lib\n" if ($macro =~ /^USE_/);
+ }
+ else
+ {
+ $libs .= "STATICLIBRARY $lib\n" if ($macro =~ /^DISABLE_/);
+ }
+ $macro_counter++;
+ }
+ # no comment? add the macro
+ if ($line =~ /^\s*MACRO/)
+ {
+ $macros2 .= "$line\n";
+ }
+ }
+
+ print "$macro_counter macro lines.\n";
+
+ $n = "AUTO_MACROS_SLAVE";
+ $a = "\/\/START_$n\/\/";
+ $b = "\/\/STOP_$n\/\/";
+
+ foreach $name (@mmp_files)
+ {
+ $file = "$buildDir/$name";
+ print "Updating macros in backends/epoc/build/$name ... ";
+
+ open FILE, "$file";
+ @lines = <FILE>;
+ close FILE;
+
+ $onestr = join("", at lines);
+
+ # slash in name means it's a phone specific build file: add LIBs
+ my $libs2 = ""; # output
+ $libs2 .= "$libs$libZ" if ($name =~ /\//);
+
+ $onestr =~ s/$a.*$b/$a$updated$macros2$libs2$b/s;
+
+ open FILE, ">$file";
+ print FILE $onestr;
+ close FILE;
+
+ my $count = @lines;
+ print "wrote $count lines.\n";
+ }
+}
+
+##################################################################################################################
More information about the Scummvm-git-logs
mailing list