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 /platform | |
| 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 'platform')
| -rw-r--r-- | platform/android/export/export.cpp | 2 | ||||
| -rw-r--r-- | platform/osx/os_osx.mm | 2 | ||||
| -rw-r--r-- | platform/windows/godot_res.rc | 8 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index c15aa2bd71..e1ff12c5ac 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -370,7 +370,7 @@ class EditorExportAndroid : public EditorExportPlatform { } if (aname == "") { - aname = _MKSTR(VERSION_NAME); + aname = VERSION_NAME; } return aname; diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index ec8ec613d3..110cb776ee 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1369,7 +1369,7 @@ String OS_OSX::get_cache_path() const { // Get properly capitalized engine name for system paths String OS_OSX::get_godot_dir_name() const { - return String(_MKSTR(VERSION_SHORT_NAME)).capitalize(); + return String(VERSION_SHORT_NAME).capitalize(); } String OS_OSX::get_system_dir(SystemDir p_dir) const { diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc index b86869d316..c535a749c0 100644 --- a/platform/windows/godot_res.rc +++ b/platform/windows/godot_res.rc @@ -23,13 +23,13 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Godot Engine" - VALUE "FileDescription", _MKSTR(VERSION_NAME) " Editor" + VALUE "FileDescription", VERSION_NAME " Editor" VALUE "FileVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) - VALUE "ProductName", _MKSTR(VERSION_NAME) + VALUE "ProductName", VERSION_NAME VALUE "Licence", "MIT" VALUE "LegalCopyright", "Copyright (c) 2007-" _MKSTR(VERSION_YEAR) " Juan Linietsky, Ariel Manzur" - VALUE "Info", "http://www.godotengine.org" - VALUE "ProductVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) PATCH_STRING "." _MKSTR(VERSION_REVISION) + VALUE "Info", "https://godotengine.org" + VALUE "ProductVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) PATCH_STRING "." VERSION_BUILD END END BLOCK "VarFileInfo" diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 70ac57c7bf..72d51ad62a 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2166,7 +2166,7 @@ String OS_Windows::get_cache_path() const { // Get properly capitalized engine name for system paths String OS_Windows::get_godot_dir_name() const { - return String(_MKSTR(VERSION_SHORT_NAME)).capitalize(); + return String(VERSION_SHORT_NAME).capitalize(); } String OS_Windows::get_system_dir(SystemDir p_dir) const { |