diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-20 08:54:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 08:54:19 +0100 |
| commit | 83e72877524f1fdd8eeacf96021719770b8fde22 (patch) | |
| tree | 9f89c49542fc2dd65f96b224c11f34fb07916f57 /core/engine.cpp | |
| parent | 414b388499a7fbabe85f60a968612175e61540f9 (diff) | |
| parent | 3fd23da5ee2e69e1aca663b52ecf1f3d61188a64 (diff) | |
| download | redot-engine-83e72877524f1fdd8eeacf96021719770b8fde22.tar.gz | |
Merge pull request #13053 from akien-mga/methods-mkstr
Remove need to _MKSTR version strings and rename "revision" to "build"
Diffstat (limited to 'core/engine.cpp')
| -rw-r--r-- | core/engine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/engine.cpp b/core/engine.cpp index 31abcd62ef..53c7a73b43 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -84,17 +84,17 @@ Dictionary Engine::get_version_info() const { #else dict["patch"] = 0; #endif - dict["status"] = _MKSTR(VERSION_STATUS); - dict["revision"] = _MKSTR(VERSION_REVISION); + dict["status"] = VERSION_STATUS; + dict["build"] = VERSION_BUILD; dict["year"] = VERSION_YEAR; - String hash = String(VERSION_HASH); + String hash = VERSION_HASH; dict["hash"] = hash.length() == 0 ? String("unknown") : hash; String stringver = String(dict["major"]) + "." + String(dict["minor"]); if ((int)dict["patch"] != 0) stringver += "." + String(dict["patch"]); - stringver += "-" + String(dict["status"]) + " (" + String(dict["revision"]) + ")"; + stringver += "-" + String(dict["status"]) + " (" + String(dict["build"]) + ")"; dict["string"] = stringver; return dict; |