Simplify handling of version info.

They're static strings, there's no point in having functions just to malloc
and pass them around.

1 files changed, 18 insertions, 63 deletions

diff --git a/crawl-ref/source/version.cc b/crawl-ref/source/version.cc
index f0c4a024eb..4c56eade47 100644
--- a/crawl-ref/source/version.cc
+++ b/crawl-ref/source/version.cc
@@ -12,76 +12,31 @@
 
 namespace Version
 {
-    string Major()
-    {
-        return string(CRAWL_VERSION_MAJOR);
-    }
-
-    string Short()
-    {
-        return string(CRAWL_VERSION_SHORT);
-    }
-
-    string Long()
-    {
-        return string(CRAWL_VERSION_LONG);
-    }
-
-    rel_type ReleaseType()
-    {
-        return CRAWL_VERSION_RELEASE;
-    }
+    const char* Major          = CRAWL_VERSION_MAJOR;
+    const char* Short          = CRAWL_VERSION_SHORT;
+    const char* Long           = CRAWL_VERSION_LONG;
+    const rel_type ReleaseType = CRAWL_VERSION_RELEASE;
+}
 
-    string Compiler()
-    {
 #if defined(__GNUC__) && defined(__VERSION__)
-        return make_stringf("GCC %s", __VERSION__);
+ #define COMPILER "GCC %s" __VERSION__
 #elif defined(__GNUC__)
-        return "GCC (unknown version)";
+ #define COMPILER "GCC (unknown version)"
 #elif defined(TARGET_COMPILER_MINGW)
-        return "MINGW";
+ #define COMPILER "MINGW"
 #elif defined(TARGET_COMPILER_CYGWIN)
-        return "CYGWIN";
+ #define COMPILER "CYGWIN"
 #elif defined(TARGET_COMPILER_VC)
-        return "Visual C++";
+ #define COMPILER "Visual C++"
 #elif defined(TARGET_COMPILER_ICC)
-        return "Intel C++";
+ #define COMPILER "Intel C++"
 #else
-        return "Unknown compiler";
+ #define COMPILER "Unknown compiler"
 #endif
-    }
 
-    string BuildArch()
-    {
-        return CRAWL_HOST;
-    }
-    string Arch()
-    {
-        return CRAWL_ARCH;
-    }
-
-    string CFLAGS()
-    {
-        return CRAWL_CFLAGS;
-    }
-
-    string LDFLAGS()
-    {
-        return CRAWL_LDFLAGS;
-    }
-}
-
-string compilation_info()
-{
-    string out = "";
-
-    out += make_stringf("Compiled with %s on %s at %s\n",
-                        Version::Compiler().c_str(), __DATE__, __TIME__);
-    out += make_stringf("Build platform: %s\n", Version::BuildArch().c_str());
-    out += make_stringf("Platform: %s\n", Version::Arch().c_str());
-
-    out += make_stringf("CFLAGS: %s\n", Version::CFLAGS().c_str());
-    out += make_stringf("LDFLAGS: %s\n", Version::LDFLAGS().c_str());
-
-    return out;
-}
+const char* compilation_info =
+    "Compiled with " COMPILER " on " __DATE__ " at " __TIME__ "\n"
+    "Build platform: " CRAWL_HOST "\n"
+    "Platform: " CRAWL_ARCH "\n"
+    "CFLAGS: " CRAWL_CFLAGS "\n"
+    "LDFLAGS: " CRAWL_LDFLAGS "\n";