[Scummvm-cvs-logs] scummvm master -> bfb326a4a2edcaaac6f2610e5f3b6fb87d321583

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9cdcce6bc6 Symbian: add Sherlock engine support
84c516d47a Symbian: cleanup build script
bfb326a4a2 Merge pull request #631 from fedor4ever/fedor4ever-patch-1


Commit: 9cdcce6bc68190d04bc65cb443606092487f81a3
    https://github.com/scummvm/scummvm/commit/9cdcce6bc68190d04bc65cb443606092487f81a3
Author: Fedor (fedor4ever at users.noreply.github.com)
Date: 2015-12-03T23:31:20+03:00

Commit Message:
Symbian: add Sherlock engine support

Changed paths:
    backends/platform/symbian/AdaptAllMMPs.pl



diff --git a/backends/platform/symbian/AdaptAllMMPs.pl b/backends/platform/symbian/AdaptAllMMPs.pl
index 6b9f918..a836b76 100644
--- a/backends/platform/symbian/AdaptAllMMPs.pl
+++ b/backends/platform/symbian/AdaptAllMMPs.pl
@@ -56,6 +56,7 @@ chdir("../../../");
 	"mmp/scummvm_lastexpress.mmp",
 	"mmp/scummvm_mads.mmp",
 	"mmp/scummvm_prince.mmp",
+	"mmp/scummvm_sherlock.mmp",
 	"mmp/scummvm_sword25.mmp",
 	"mmp/scummvm_testbed.mmp",
 	"mmp/scummvm_zvision.mmp",
@@ -203,6 +204,7 @@ ParseModule("_lastexpress","lastexpress",	\@section_empty);
 ParseModule("_m4",		"m4",		\@section_empty);
 ParseModule("_mads"			,"mads",	\@section_empty);
 ParseModule("_prince"			,"prince",	\@section_empty);
+ParseModule("_sherlock"     ,"sherlock",	\@section_empty);
 ParseModule("_sword25"     ,"sword25",	\@section_empty);
 ParseModule("_testbed"     ,"testbed",	\@section_empty);
 ParseModule("_zvision"     ,"zvision",	\@section_empty);


Commit: 84c516d47a3a05071eb3d2c3e8949a62448a58d6
    https://github.com/scummvm/scummvm/commit/84c516d47a3a05071eb3d2c3e8949a62448a58d6
Author: Fedor (fedor4ever at users.noreply.github.com)
Date: 2015-12-03T23:43:22+03:00

Commit Message:
Symbian: cleanup build script

Add missed engines, all engines ordered by names, simplified and clear comments

Changed paths:
    backends/platform/symbian/BuildPackageUpload_LocalSettings.pl



diff --git a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
index 8c19631..10bcf03 100644
--- a/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
+++ b/backends/platform/symbian/BuildPackageUpload_LocalSettings.pl
@@ -1,36 +1,32 @@
 
 ##################################################################################################################
+####	sword25 ignored because of incompatible resolution 800*600
 
 	@WorkingEngines = qw(
-		agos agi cine cge composer cruise draci dreamweb
-		drascula hugo gob groovie hopkins kyra lastexpress
-		lure made mohawk mortevielle neverhood parallaction
-		pegasus queen saga sci scumm sky sword1 sword2
-		teenagent tinsel toltecs tony toon touche tsage
-		tucker voyeur wintermute
-		access avalanche bbvs cge2 fullpipe mads prince
-		testbed zvision
+		access agi agos avalanche bbvs cge cge2
+		cine composer cruise draci drascula
+		dreamweb fullpipe gob groovie hopkins
+		hugo kyra lastexpress lure made mads
+		mohawk mortevielle neverhood parallaction
+		pegasus prince queen saga sci scumm
+		sherlock sky sword1 sword2 teenagent
+		testbed tinsel toltecs tony toon touche
+		tsage tucker voyeur wintermute zvision
 	);
-	
-####	sword25 yet not added
-
-#### In progress engines are :
-####  access avalanche bbvs cge2 fullpipe mads prince
-####  testbed zvision
 
 	@WorkingEngines_1st = qw(
-		cine composer cruise drascula groovie
-		lastexpress made parallaction queen saga
-		scumm touche tucker wintermute voyeur
-		access avalanche cge2 zvision
+		access agi agos cge2 cine composer cruise
+		drascula gob groovie kyra lastexpress made
+		neverhood parallaction queen saga scumm
+		touche tucker voyeur wintermute
 	);
 
 	@WorkingEngines_2nd = qw(
-		agi agos cge draci dreamweb gob hopkins
-		hugo kyra lure mohawk mortevielle neverhood  
-		pegasus sci sky sword1 sword2 teenagent
-		tinsel tsage toltecs tony toon
-		bbvs fullpipe mads prince testbed
+		avalanche bbvs cge draci dreamweb fullpipe
+		hopkins hugo lure mads mohawk mortevielle
+		pegasus prince sci sherlock sky sword1 sword2
+		teenagent testbed tinsel toltecs tony toon
+		tsage zvision
 	);
 ####	sword25 yet not added
 


Commit: bfb326a4a2edcaaac6f2610e5f3b6fb87d321583
    https://github.com/scummvm/scummvm/commit/bfb326a4a2edcaaac6f2610e5f3b6fb87d321583
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-12-06T16:24:44+01:00

Commit Message:
Merge pull request #631 from fedor4ever/fedor4ever-patch-1

SYMBIAN: various fixes in build scripts

Changed paths:
    backends/platform/symbian/AdaptAllMMPs.pl
    backends/platform/symbian/BuildPackageUpload_LocalSettings.pl