From 33886e22afae11209f20bfe86fc8c2dcc4429d64 Mon Sep 17 00:00:00 2001 From: Lars Persson Date: Sun, 29 Aug 2010 08:26:59 +0000 Subject: Build a couple of different variant to split engines in two. svn-id: r52435 --- backends/platform/symbian/AdaptAllMMPs.pl | 2 +- .../platform/symbian/BuildPackageUpload_LocalSettings.pl | 14 ++++++-------- backends/platform/symbian/mmp/scummvm_base.mmp.in | 2 ++ 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'backends/platform/symbian') diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl index 09b64371ce..8b7151c180 100644 --- a/backends/platform/symbian/AdaptAllMMPs.pl +++ b/backends/platform/symbian/AdaptAllMMPs.pl @@ -80,9 +80,9 @@ my @excludes_snd = ( "fluidsynth.cpp", "i386.cpp", "part.*", - "synth.cpp", "tables.cpp", "freeverb.cpp", + "synth.cpp", "rate.*" # not really needed, USE_ARM_SOUND_ASM currently not parsed correctly, # "rate[_arm|_arm_asm].(cpp|s)" will be added later based on WINS/ARM build! # These #defines for compile time are set in portdefs.h diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl index d548c81795..b6ebbafe74 100644 --- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl +++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl @@ -10,21 +10,18 @@ @WorkingEngines_1st = qw( scumm queen groovie saga drascula touche parallaction cine - cruise made m4 tucker +? cruise made m4 tucker ); @WorkingEngines_2nd = qw( agos sky gob kyra lure agi tinsel - sword1 sword2 draci teenagent hugo + sword1 sword2 draci sci teenagent hugo ); @TestingEngines = qw( - ); - - @BrokenEngines = qw( - ); + ); @EnablableEngines = (@WorkingEngines, @TestingEngines); @@ -249,7 +246,7 @@ $SDK_RootDirs{'S60v3'}= "G:\\S60v3"; #$SDK_RootDirs{'S80'}= "D:\\S80"; #$SDK_RootDirs{'S90'}= "D:\\S90"; - $ECompXL_BinDir= "D:\\ECompXL\\"; + #$ECompXL_BinDir= "D:\\ECompXL\\"; if (0) # so we can turn them on/off easily { # $SDK_LibraryDirs{'ALL'}{'zlib.lib'} = "C:\\S\\zlib-1.2.2\\epoc"; @@ -305,7 +302,8 @@ # the first one includes all SDKs & release-ready engines $VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines"; - + $VariationSets{'ALL'}{'1St'} = "$DefaultFeatures @WorkingEngines_1st @EnablableSubEngines"; + $VariationSets{'ALL'}{'2nd'} = "$DefaultFeatures @WorkingEngines_2nd @EnablableSubEngines"; # now one for each ready-for-release engine if (0) { diff --git a/backends/platform/symbian/mmp/scummvm_base.mmp.in b/backends/platform/symbian/mmp/scummvm_base.mmp.in index c178440fa9..ceb62ec843 100644 --- a/backends/platform/symbian/mmp/scummvm_base.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_base.mmp.in @@ -98,6 +98,8 @@ SOURCEPATH ..\..\..\..\sound // empty base file, will be updated by Perl build scripts //STOP_AUTO_OBJECTS_SOUND_// +SOURCE softsynth\fmtowns_pc98\towns_pc98_fmsynth.cpp // Included since its excluded by filter + #if defined (WINS) SOURCE rate.cpp // WINS emulator version: add regular .cpp #else -- cgit v1.2.3