From a2e701d77fc98a4126e6efac8b60c1e7bacdecb0 Mon Sep 17 00:00:00 2001
From: anotherguest
Date: Wed, 11 Jun 2014 11:48:07 +0200
Subject: SYMBIAN: Added support for two new engines. Updated MMP files and
 help files from Fedors changes.

---
 .../symbian/BuildPackageUpload_LocalSettings.pl    | 39 ++++++++++++----------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'backends/platform/symbian/BuildPackageUpload_LocalSettings.pl')

diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index 4ff485b3e3..12fc2668e3 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -2,13 +2,13 @@
 ##################################################################################################################
 
 	@WorkingEngines = qw(
-		agos agi cine cge composer cruise draci
+		agos agi bbvs cine cge composer cruise draci
 		drascula hugo gob groovie kyra lastexpress
 		lure made mohawk parallaction pegasus queen
 		saga sci scumm sky sword1 sword2 teenagent tinsel
 		toltecs tony toon touche tsage tucker wintermute
-		dreamweb fullpipe hopkins mortevielle
-		neverhood testbed avalanche zvision
+		dreamweb fullpipe hopkins mortevielle mads
+		neverhood testbed avalanche zvision voyeur
 	);
 #### New engines
 ####		sword25
@@ -17,13 +17,13 @@
 		cine composer cruise drascula groovie
 		lastexpress made parallaction queen
 		saga scumm touche tucker wintermute
-		avalanche zvision
+		avalanche zvision voyeur
 	);
 
 	@WorkingEngines_2nd = qw(
-		agi agos cge draci gob hopkins
+		agi agos bbvs cge draci gob hopkins
 		hugo kyra lure mohawk pegasus sci
-		sky sword1 sword2 teenagent
+		sky sword1 sword2 teenagent mads
 		tinsel tsage toltecs tony toon
 		dreamweb fullpipe mortevielle
 		neverhood testbed
@@ -55,20 +55,22 @@
 
 	# see configure.engines
 	%UseableFeatures = (
-		'zlib'		=> 'zlib.lib',
-		'mad'		=> 'libmad.lib',
-		'tremor'	=> 'libtremor.lib',
-		'flac'		=> 'libflacdec.lib',
 		'freetype2'		=> 'freetype.lib',
 		'faad'		=> 'libFAAD2.lib',
-		'mpeg2'	=>  'libmpeg2.lib'
+		'flac'		=> 'libflacdec.lib',
+		'jpeg'		=> 'libjpeg.lib',
+		'mad'		=> 'libmad.lib',
+		'mpeg2'		=> 'libmpeg2.lib',
+		'png'		=> 'libpng.lib',
+		'tremor'	=> 'libtremor.lib',
+		'theoradec' => 'theora.lib',
+		'zlib'		=> 'zlib.lib'
 	);
-		# 'mpeg2'	=>  'libmpeg2.lib'
 
 	# these are normally enabled for each variation
 	#$DefaultFeatures = qw(zlib,mad);
 	#$DefaultFeatures = qw(zlib,mad,tremor,);
-	$DefaultFeatures = qw(mad,tremor,faad,flac,freetype2,mpeg2,zlib,);
+	$DefaultFeatures = qw(faad,flac,freetype2,jpeg,mad,mpeg2,png,theoradec,tremor,zlib,);
 
 ##################################################################################################################
 	##
@@ -102,7 +104,7 @@
 	#	$SDK_RootDirs{'UIQ3'}	= "$DevBase\\UIQ3";
 	#	$SDK_RootDirs{'S60v1'}	= "$DevBase\\S60v1";
 	#	$SDK_RootDirs{'S60v2'}	= "$DevBase\\S60v2";
-		$SDK_RootDirs{'S60v3'}	= "$DevBase\\S60v3";
+		$SDK_RootDirs{'S60v3'}	= "$DevBase\\S60v5";
 	#	$SDK_RootDirs{'S80'}	= "$DevBase\\S80";
 	#	$SDK_RootDirs{'S90'}	= "$DevBase\\S90";
 
@@ -123,7 +125,7 @@
 			my $SdlBase = "$DevBase\\SDL-1.2.12-ag\\Symbian";
 			#$SDK_LibraryDirs{'S60v1'}{'esdl.lib'}	= "$SdlBase\\S60"; // unsupported?
 			#$SDK_LibraryDirs{'S60v2'}{'esdl.lib'}	= "$SdlBase\\S60v2";
-			$SDK_LibraryDirs{'S60v3'}{'esdl.lib'}	= "$SdlBase\\S60v3";
+			$SDK_LibraryDirs{'S60v3'}{'esdl.lib'}	= "$SdlBase\\S60v5";
 			#$SDK_LibraryDirs{'S80'}{'esdl.lib'}	= "$SdlBase\\S80";
 			#$SDK_LibraryDirs{'S90'}{'esdl.lib'}	= "$SdlBase\\S90";
 			#$SDK_LibraryDirs{'UIQ2'}{'esdl.lib'}	= "$SdlBase\\UIQ2"
@@ -245,14 +247,14 @@
 		# now you can add $VariationSets only built on this PC below this line :)
 
 	}
-	elsif ($ENV{'COMPUTERNAME'} eq "PC-FOREVER1111") #################################################################
+	elsif ($ENV{'COMPUTERNAME'} eq "FEDOR4EVER") #################################################################
 	{
 		$Producer = "Fedor";
 		$RedirectSTDERR = 1;
 		$HaltOnError = 0;
 		$SkipExistingPackages = 0;
 		$ReallyQuiet = 0;
-		$Compiler = "D:\\Program/ Files\\CodeSourcery\\Sourcery/ G++ Lite";
+		$Compiler = "D:\\Program/ Files\\CodeSourcery\\Sourcery/ G++/ Lite";
 
 		#$FTP_Host = "host.com";
 		#$FTP_User = "ag@host.com";
@@ -323,7 +325,8 @@
 	{
 		# the first one includes all SDKs & release-ready engines
 
-			$VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines";
+			# $VariationSets{'ALL'}{'all'} = "$DefaultFeatures @WorkingEngines @EnablableSubEngines";
+			$VariationSets{'ALL'}{'split'} = "$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
-- 
cgit v1.2.3