From 40df14a7558728019e9755bce57ddd7fd0ab877e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 1 May 2011 14:43:36 +0300
Subject: RELEASE: Tag branch-1-3-0 and set version

---
 base/internal_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base')

diff --git a/base/internal_version.h b/base/internal_version.h
index 36cdcdeb39..f7b42529cb 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,4 +16,4 @@
 #define SCUMMVM_REVISION
 #endif
 
-#define SCUMMVM_VERSION "1.3.0git" SCUMMVM_REVISION
+#define SCUMMVM_VERSION "1.3.0pre" SCUMMVM_REVISION
-- 
cgit v1.2.3


From b2748520bbd2a604784fe5820d115ed007c31db8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 5 May 2011 17:43:33 +0200
Subject: BASE: Suppress pointless warning message (fixes bug #3291522)

---
 base/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'base')

diff --git a/base/main.cpp b/base/main.cpp
index 7a77d6af7a..11cd6de67c 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -351,7 +351,8 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	// TODO: deal with settings that require plugins to be loaded
 	res = Base::processSettings(command, settings);
 	if (res.getCode() != Common::kArgumentNotProcessed) {
-		warning("%s", res.getDesc().c_str());
+		if (res.getCode() != Common::kNoError)
+			warning("%s", res.getDesc().c_str());
 		return res.getCode();
 	}
 
-- 
cgit v1.2.3


From 92a71f7452b83b5491ba0862d8da9f23055fd5bd Mon Sep 17 00:00:00 2001
From: agent-q
Date: Sat, 21 May 2011 15:45:51 +0100
Subject: DS: Port of changes from branch-1-2-0 that I should really have moved
 into the trunk.

"DS: Prevent the command line help string from being included in the binary."
5f3a90a5f6911188b8d1ded08dbdf6d233e9eb7b

"GUI: Allow disabling of Mass Add dialog.  Saves a few Kb of binary size on the DS, and is not particularly useful on that platform."
240ff87cf4472538d25a1c5628c8d15f1791ab1c

"GUI: Don't search for theme zip files on startup when running on the DS.  Themes aren't supported anyway, and the search severely delays startup."
fe3b18ce0df03117081e83d99f4a2cbd864d3286
---
 base/commandLine.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'base')

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index b74370df4c..0808f87fb3 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -50,7 +50,7 @@ static const char USAGE_STRING[] =
 ;
 
 // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :)
-#if defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID)
+#if defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID) || defined(__DS__)
 static const char HELP_STRING[] = "NoUsageString"; // save more data segment space
 #else
 static const char HELP_STRING[] =
@@ -144,7 +144,7 @@ static void usage(const char *s, ...) {
 	vsnprintf(buf, STRINGBUFLEN, s, va);
 	va_end(va);
 
-#if !(defined(__GP32__) || defined (__SYMBIAN32__))
+#if !(defined(__GP32__) || defined (__SYMBIAN32__) || defined(__DS__))
 	printf(USAGE_STRING, s_appName, buf, s_appName, s_appName);
 #endif
 	exit(1);
@@ -962,7 +962,7 @@ Common::Error processSettings(Common::String &command, Common::StringMap &settin
 	// environment variable. This is weaker than a --savepath on the
 	// command line, but overrides the default savepath, hence it is
 	// handled here, just before the command line gets parsed.
-#if !defined(_WIN32_WCE) && !defined(__GP32__) && !defined(ANDROID)
+#if !defined(_WIN32_WCE) && !defined(__GP32__) && !defined(ANDROID) && !defined(__DS__)
 	if (!settings.contains("savepath")) {
 		const char *dir = getenv("SCUMMVM_SAVEPATH");
 		if (dir && *dir && strlen(dir) < MAXPATHLEN) {
-- 
cgit v1.2.3