diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-02-08 20:50:37 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-02-09 09:20:17 +0100 |
| commit | 90162851a79f46a0e8887e9a403b9ee4db333eb9 (patch) | |
| tree | 8bc70136e480e953a1b064c8b728165058934a54 /core | |
| parent | 3cb9dc78d6001af550f125bb6f8b7da27a291add (diff) | |
Core: Move generated `VERSION_HASH` to a `.cpp` file
This lets us have its definition in `core/version.h` and avoid
rebuilding a handful of files every time the commit hash changes.
Diffstat (limited to 'core')
| -rw-r--r-- | core/SCsub | 1 | ||||
| -rw-r--r-- | core/config/engine.cpp | 5 | ||||
| -rw-r--r-- | core/version.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/core/SCsub b/core/SCsub index c12dd4e60e..1379e9df9b 100644 --- a/core/SCsub +++ b/core/SCsub @@ -147,6 +147,7 @@ env.core_sources += thirdparty_obj env.add_source_files(env.core_sources, "*.cpp") env.add_source_files(env.core_sources, "script_encryption_key.gen.cpp") +env.add_source_files(env.core_sources, "version_hash.gen.cpp") # Certificates env.Depends( diff --git a/core/config/engine.cpp b/core/config/engine.cpp index d9abf5e5e9..ff8a8d283f 100644 --- a/core/config/engine.cpp +++ b/core/config/engine.cpp @@ -35,7 +35,6 @@ #include "core/donors.gen.h" #include "core/license.gen.h" #include "core/version.h" -#include "core/version_hash.gen.h" void Engine::set_physics_ticks_per_second(int p_ips) { ERR_FAIL_COND_MSG(p_ips <= 0, "Engine iterations per second must be greater than 0."); @@ -95,8 +94,8 @@ Dictionary Engine::get_version_info() const { dict["build"] = VERSION_BUILD; dict["year"] = VERSION_YEAR; - String hash = VERSION_HASH; - dict["hash"] = hash.length() == 0 ? String("unknown") : hash; + String hash = String(VERSION_HASH); + dict["hash"] = hash.is_empty() ? String("unknown") : hash; String stringver = String(dict["major"]) + "." + String(dict["minor"]); if ((int)dict["patch"] != 0) { diff --git a/core/version.h b/core/version.h index c718d0f4d7..e22922fa66 100644 --- a/core/version.h +++ b/core/version.h @@ -68,4 +68,7 @@ // Example: "Godot v3.1.4.stable.official.mono" #define VERSION_FULL_NAME "" VERSION_NAME " v" VERSION_FULL_BUILD +// Git commit hash, generated at build time in `core/version_hash.gen.cpp`. +extern const char *const VERSION_HASH; + #endif // VERSION_H |