diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-10-23 23:23:31 -0400 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-10-23 23:23:31 -0400 |
| commit | cb0d3f7aa0c51edcf230a8fb8a53c8845f1335da (patch) | |
| tree | 1c574172601a31b96164a5c5be92681ecf8dbb94 /core | |
| parent | 07f92e63a654633044c1059f91caaa7c3c93250f (diff) | |
| download | redot-engine-cb0d3f7aa0c51edcf230a8fb8a53c8845f1335da.tar.gz | |
Fix VERSION_FULL_CONFIG ignoring status versioning
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/engine.cpp | 3 | ||||
| -rw-r--r-- | core/version.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/config/engine.cpp b/core/config/engine.cpp index af8c3729be..ecdf728aa7 100644 --- a/core/config/engine.cpp +++ b/core/config/engine.cpp @@ -125,8 +125,7 @@ Dictionary Engine::get_version_info() const { dict["hex"] = VERSION_HEX; dict["status"] = VERSION_STATUS; dict["build"] = VERSION_BUILD; - - dict["status_version"] = dict["status"] != "stable" ? VERSION_STATUS_VERSION : 0; + dict["status_version"] = VERSION_STATUS_VERSION; String hash = String(VERSION_HASH); dict["hash"] = hash.is_empty() ? String("unknown") : hash; diff --git a/core/version.h b/core/version.h index 09d7ec24fd..19365ac8f0 100644 --- a/core/version.h +++ b/core/version.h @@ -67,7 +67,11 @@ // Describes the full configuration of that Redot version, including the version number, // the status (beta, stable, etc.) and potential module-specific features (e.g. mono). // Example: "3.1.4.stable.mono" -#define VERSION_FULL_CONFIG VERSION_NUMBER "." VERSION_STATUS VERSION_MODULE_CONFIG +#if VERSION_STATUS_VERSION == 0 +#define VERSION_FULL_CONFIG VERSION_NUMBER "." VERSION_STATUS "." VERSION_MODULE_CONFIG +#else +#define VERSION_FULL_CONFIG VERSION_NUMBER "." VERSION_STATUS "." _MKSTR(VERSION_STATUS_VERSION) VERSION_MODULE_CONFIG +#endif // Similar to VERSION_FULL_CONFIG, but also includes the (potentially custom) VERSION_BUILD // description (e.g. official, custom_build, etc.). |