OPENGL: Merged from trunk, from rev 52105 to 53396.

This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.

Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.

svn-id: r53399

5 files changed, 31 insertions, 9 deletions

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 2f4e78fd80..5a45ed74a1 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -578,6 +578,10 @@ static void listTargets() {
 	using namespace Common;
 	const ConfigManager::DomainMap &domains = ConfMan.getGameDomains();
 	ConfigManager::DomainMap::const_iterator iter;
+
+	Common::Array<Common::String> targets;
+	targets.reserve(domains.size());
+
 	for (iter = domains.begin(); iter != domains.end(); ++iter) {
 		Common::String name(iter->_key);
 		Common::String description(iter->_value.getVal("description"));
@@ -592,9 +596,13 @@ static void listTargets() {
 				description = g.description();
 		}
 
-		printf("%-20s %s\n", name.c_str(), description.c_str());
-
+		targets.push_back(Common::String::printf("%-20s %s", name.c_str(), description.c_str()));
 	}
+
+	Common::sort(targets.begin(), targets.end());
+
+	for (Common::Array<Common::String>::const_iterator i = targets.begin(), end = targets.end(); i != end; ++i)
+		printf("%s\n", i->c_str());
 }
 
 /** List all saves states for the given target. */
@@ -950,9 +958,9 @@ Common::Error processSettings(Common::String &command, Common::StringMap &settin
 		if (dir && *dir && strlen(dir) < MAXPATHLEN) {
 			Common::FSNode saveDir(dir);
 			if (!saveDir.exists()) {
-				warning("Non-existent SCUMMVM_SAVEPATH save path. It will be ignored.");
+				warning("Non-existent SCUMMVM_SAVEPATH save path. It will be ignored");
 			} else if (!saveDir.isWritable()) {
-				warning("Non-writable SCUMMVM_SAVEPATH save path. It will be ignored.");
+				warning("Non-writable SCUMMVM_SAVEPATH save path. It will be ignored");
 			} else {
 				settings["savepath"] = dir;
 			}
diff --git a/base/internal_version.h b/base/internal_version.h
index 5fd0535142..5a049b0bb8 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -11,4 +11,4 @@
 #define SCUMMVM_SVN_REVISION
 #endif
 
-#define SCUMMVM_VERSION "1.2.0svn" SCUMMVM_SVN_REVISION
+#define SCUMMVM_VERSION "1.3.0svn" SCUMMVM_SVN_REVISION
diff --git a/base/main.cpp b/base/main.cpp
index 3173f26783..7afba3db37 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -320,9 +320,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	// Update the config file
 	ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
 
-	// Enable translation
-	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
-
 	// Load and setup the debuglevel and the debug flags. We do this at the
 	// soonest possible moment to ensure debug output starts early on, if
 	// requested.
diff --git a/base/plugins.cpp b/base/plugins.cpp
index ea3c65684a..e2af9328a7 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -115,6 +115,9 @@ public:
 		#if PLUGIN_ENABLED_STATIC(GROOVIE)
 		LINK_PLUGIN(GROOVIE)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(HUGO)
+		LINK_PLUGIN(HUGO)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(KYRA)
 		LINK_PLUGIN(KYRA)
 		#endif
@@ -151,12 +154,21 @@ public:
 		#if PLUGIN_ENABLED_STATIC(SWORD2)
 		LINK_PLUGIN(SWORD2)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(SWORD25)
+		LINK_PLUGIN(SWORD25)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(TEENAGENT)
 		LINK_PLUGIN(TEENAGENT)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(TESTBED)
+		LINK_PLUGIN(TESTBED)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(TINSEL)
 		LINK_PLUGIN(TINSEL)
 		#endif
+		#if PLUGIN_ENABLED_STATIC(TOON)
+		LINK_PLUGIN(TOON)
+		#endif
 		#if PLUGIN_ENABLED_STATIC(TOUCHE)
 		LINK_PLUGIN(TOUCHE)
 		#endif
@@ -200,13 +212,14 @@ public:
 		LINK_PLUGIN(ADLIB)
 		LINK_PLUGIN(PCSPK)
 		LINK_PLUGIN(PCJR)
+		LINK_PLUGIN(CMS)
 		#ifndef DISABLE_SID
 		LINK_PLUGIN(C64)
 		#endif
 		LINK_PLUGIN(AMIGA)
 		LINK_PLUGIN(APPLEIIGS)
 		LINK_PLUGIN(TOWNS)
-		#if defined (UNIX)
+		#if defined(USE_TIMIDITY)
 		LINK_PLUGIN(TIMIDITY)
 		#endif
 
diff --git a/base/version.cpp b/base/version.cpp
index 055067a656..2a6d1bb0c0 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -92,6 +92,10 @@ const char *gScummVMFeatures = ""
 	"SEQ "
 #endif
 
+#ifdef USE_TIMIDITY
+	"TiMidity "
+#endif
+
 #ifdef USE_RGB_COLOR
 	"RGB "
 #endif