Merge pull request #228 from sshiiden/version-info

Consistent version.h
blazium-engine · Jan 12, 2025 · c337c02 · c337c02
2 parents 465fbbb + 6a5ab3d
commit c337c02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/version.h b/core/version.h
@@ -86,11 +86,11 @@
 // Similar to EXTERNAL_VERSION_FULL_CONFIG, but also includes the VERSION_FULL_BUILD
 // description.
 // Example: "0.1.0.stable.mono (3.1.4.stable.mono.official)"
-#define EXTERNAL_VERSION_FULL_BUILD EXTERNAL_VERSION_NUMBER "(" VERSION_FULL_BUILD ")"
+#define EXTERNAL_VERSION_FULL_BUILD EXTERNAL_VERSION_FULL_CONFIG " (" VERSION_FULL_BUILD ")"
 
 // Same as above, but prepended with Godot's name and a cosmetic "v" for "version".
-// Example: "Blazium v0.1.0.nightly.mono (base v3.1.4.stable.mono.official)"
-#define VERSION_FULL_NAME VERSION_NAME " v" EXTERNAL_VERSION_NUMBER " (base v" VERSION_FULL_BUILD ")"
+// Example: "Blazium Engine v0.1.0.nightly.mono (3.1.4.stable.mono.official)"
+#define VERSION_FULL_NAME VERSION_NAME " v" EXTERNAL_VERSION_FULL_BUILD
 
 // Git commit hash, generated at build time in `core/version_hash.gen.cpp`.
 extern const char *const VERSION_HASH;

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
@@ -5015,7 +5015,7 @@ String EditorNode::_get_system_info() const {
 	}
 	const String distribution_version = OS::get_singleton()->get_version();
 
-	String godot_version = "Blazium v" + String(VERSION_FULL_CONFIG);
+	String godot_version = String(VERSION_FULL_NAME);
 	if (String(VERSION_BUILD) != "official") {
 		String hash = String(VERSION_HASH);
 		hash = hash.is_empty() ? String("unknown") : vformat("(%s)", hash.left(9));