diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | src/core/version.cc.in | 2 | ||||
| -rw-r--r-- | src/core/version.hh | 2 | ||||
| -rw-r--r-- | src/game/client/main_menu.cc | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -1,6 +1,6 @@ /.vscode/*
!/.vscode/c_cpp_properties.json
-/core/version.cc
+/src/core/version.cc
/build32/
/build64/
/build/
diff --git a/src/core/version.cc.in b/src/core/version.cc.in index 0183ec0..0c255c9 100644 --- a/src/core/version.cc.in +++ b/src/core/version.cc.in @@ -9,4 +9,4 @@ const unsigned long project_version_patch = ${PROJECT_VERSION_PATCH}; const unsigned long project_version_tweak = ${PROJECT_VERSION_TWEAK}; // clang-format on -const std::string project_version_string = "${PROJECT_VERSION}"; +const char* project_version_string = "${PROJECT_VERSION}"; diff --git a/src/core/version.hh b/src/core/version.hh index 2061c31..fc4d48a 100644 --- a/src/core/version.hh +++ b/src/core/version.hh @@ -7,6 +7,6 @@ extern const unsigned long project_version_minor; extern const unsigned long project_version_patch; extern const unsigned long project_version_tweak; -extern const std::string project_version_string; +extern const char* project_version_string; #endif /* CORE_VERSION_HH */ diff --git a/src/game/client/main_menu.cc b/src/game/client/main_menu.cc index 39763ec..e5cb522 100644 --- a/src/game/client/main_menu.cc +++ b/src/game/client/main_menu.cc @@ -152,7 +152,7 @@ void main_menu::layout(void) ImGui::PushFont(globals::font_debug); ImGui::SetCursorScreenPos(ImVec2(padding.x + spacing.x, window_size.y - globals::font_debug->FontSize - padding.y - spacing.y)); - ImGui::Text("Voxelius %s", project_version_string.c_str()); + ImGui::Text("Voxelius %s", project_version_string); ImGui::PopFont(); } |