From 6cf009e9157fc2ca993ffa5a4b19beace12efb0f Mon Sep 17 00:00:00 2001 From: Vasily Date: Fri, 19 Apr 2019 17:12:54 +0200 Subject: [PATCH] Convert C++ code to read version string from file This is definitely not a pretty thing. Double quotes are required around the string which means they'll need to be removed in the NSIS and Python scripts. --- build_scripts/compile_version_string.txt | 2 +- src/overlaycontroller.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build_scripts/compile_version_string.txt b/build_scripts/compile_version_string.txt index 3b0338f..7107992 100644 --- a/build_scripts/compile_version_string.txt +++ b/build_scripts/compile_version_string.txt @@ -1 +1 @@ -3.1.0-dev-new \ No newline at end of file +"3.1.0-dev-new" \ No newline at end of file diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h index d515fb8..24b2fa7 100644 --- a/src/overlaycontroller.h +++ b/src/overlaycontroller.h @@ -48,7 +48,10 @@ constexpr auto applicationOrganizationName = "AdvancedSettings-Team"; constexpr auto applicationName = "OpenVRAdvancedSettings"; constexpr const char* applicationKey = "OVRAS-Team.AdvancedSettings"; constexpr const char* applicationDisplayName = "Advanced Settings"; -constexpr const char* applicationVersionString = "v3.1.0-dev"; +constexpr const char* applicationVersionString = { +#include "../build_scripts/compile_version_string.txt" +}; + } // namespace application_strings // application namespace