You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-04 12:00:25 +00:00
Merge pull request #103557 from aaronfranke/godot-version-defines
Rename version defines to `GODOT_VERSION_*` to match GDExtension godot-cpp
This commit is contained in:
@@ -286,11 +286,11 @@ static String unescape_cmdline(const String &p_str) {
|
||||
}
|
||||
|
||||
static String get_full_version_string() {
|
||||
String hash = String(VERSION_HASH);
|
||||
String hash = String(GODOT_VERSION_HASH);
|
||||
if (!hash.is_empty()) {
|
||||
hash = "." + hash.left(9);
|
||||
}
|
||||
return String(VERSION_FULL_BUILD) + hash;
|
||||
return String(GODOT_VERSION_FULL_BUILD) + hash;
|
||||
}
|
||||
|
||||
#if defined(TOOLS_ENABLED) && defined(MODULE_GDSCRIPT_ENABLED)
|
||||
@@ -393,18 +393,18 @@ void finalize_theme_db() {
|
||||
#endif
|
||||
|
||||
void Main::print_header(bool p_rich) {
|
||||
if (VERSION_TIMESTAMP > 0) {
|
||||
if (GODOT_VERSION_TIMESTAMP > 0) {
|
||||
// Version timestamp available.
|
||||
if (p_rich) {
|
||||
Engine::get_singleton()->print_header_rich("\u001b[38;5;39m" + String(VERSION_NAME) + "\u001b[0m v" + get_full_version_string() + " (" + Time::get_singleton()->get_datetime_string_from_unix_time(VERSION_TIMESTAMP, true) + " UTC) - \u001b[4m" + String(VERSION_WEBSITE));
|
||||
Engine::get_singleton()->print_header_rich("\u001b[38;5;39m" + String(GODOT_VERSION_NAME) + "\u001b[0m v" + get_full_version_string() + " (" + Time::get_singleton()->get_datetime_string_from_unix_time(GODOT_VERSION_TIMESTAMP, true) + " UTC) - \u001b[4m" + String(GODOT_VERSION_WEBSITE));
|
||||
} else {
|
||||
Engine::get_singleton()->print_header(String(VERSION_NAME) + " v" + get_full_version_string() + " (" + Time::get_singleton()->get_datetime_string_from_unix_time(VERSION_TIMESTAMP, true) + " UTC) - " + String(VERSION_WEBSITE));
|
||||
Engine::get_singleton()->print_header(String(GODOT_VERSION_NAME) + " v" + get_full_version_string() + " (" + Time::get_singleton()->get_datetime_string_from_unix_time(GODOT_VERSION_TIMESTAMP, true) + " UTC) - " + String(GODOT_VERSION_WEBSITE));
|
||||
}
|
||||
} else {
|
||||
if (p_rich) {
|
||||
Engine::get_singleton()->print_header_rich("\u001b[38;5;39m" + String(VERSION_NAME) + "\u001b[0m v" + get_full_version_string() + " - \u001b[4m" + String(VERSION_WEBSITE));
|
||||
Engine::get_singleton()->print_header_rich("\u001b[38;5;39m" + String(GODOT_VERSION_NAME) + "\u001b[0m v" + get_full_version_string() + " - \u001b[4m" + String(GODOT_VERSION_WEBSITE));
|
||||
} else {
|
||||
Engine::get_singleton()->print_header(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
|
||||
Engine::get_singleton()->print_header(String(GODOT_VERSION_NAME) + " v" + get_full_version_string() + " - " + String(GODOT_VERSION_WEBSITE));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user