From 2249ae8b79e752a9c5d0039a57dfdc54dcc8ece4 Mon Sep 17 00:00:00 2001 From: cdozdil Date: Thu, 2 May 2024 14:09:20 +0300 Subject: [PATCH] better version control --- OptiScaler/OptiScaler.rc | Bin 3866 -> 3926 bytes OptiScaler/imgui/Imgui_Base.cpp | 3 ++- OptiScaler/resource.h | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/OptiScaler/OptiScaler.rc b/OptiScaler/OptiScaler.rc index b8b8d66575bfebbd7026ea6d002e2c1cf2fde8e4..0fbc6a05e735d11642603d38733e9f3aced00cb2 100644 GIT binary patch delta 165 zcmbOwcTH}?8&*b>$!}Q=8BI3Jvz=tp4`Xm;2x5q5aAWXf@By;p86YCTK)yeNACMo+ z5CT-8z@Wqs!(cFZK8NmP70y3`c?@L?c?{_c6%2X|DGWIbIbfL#t_D+>i2*=e{tPY* Sp$yJI69}6tzL}4khXnvDPa=!} delta 73 zcmca6H%o5A8&*c6$!}Q=8I3l}vz=t(Rbnt;&|@$GVj~8<$%fpLlLI)!CcAL{nLLL} QWU?367E~3R4Y^fW0NOVZZ~y=R diff --git a/OptiScaler/imgui/Imgui_Base.cpp b/OptiScaler/imgui/Imgui_Base.cpp index 68aa0e10..34393a52 100644 --- a/OptiScaler/imgui/Imgui_Base.cpp +++ b/OptiScaler/imgui/Imgui_Base.cpp @@ -1,5 +1,6 @@ #include "../Config.h" #include "../Logger.h" +#include "../Resource.h" #include "Imgui_Base.h" #include "imgui/imgui_impl_win32.h" @@ -423,7 +424,7 @@ void Imgui_Base::RenderMenu() ImGui::SetNextWindowPos(ImVec2{ posX, posY }, ImGuiCond_FirstUseEver); - if (ImGui::Begin("OptiScaler v0.4.3", nullptr, flags)) + if (ImGui::Begin(std::format("OptiScaler v{}.{}.{}", VER_MAJOR_VERSION, VER_MINOR_VERSION, VER_HOTFIX_VERSION).c_str(), nullptr, flags)) { ImGui::SetWindowFontScale(imguiRatio); diff --git a/OptiScaler/resource.h b/OptiScaler/resource.h index 8e750278..2786e013 100644 --- a/OptiScaler/resource.h +++ b/OptiScaler/resource.h @@ -14,3 +14,17 @@ #define _APS_NEXT_SYMED_VALUE 101 #endif #endif + +#define STRINGIZE_(s) #s +#define STRINGIZE(s) STRINGIZE_(s) + +#define VER_MAJOR_VERSION 0 +#define VER_MINOR_VERSION 4 +#define VER_HOTFIX_VERSION 4 +#define VER_BUILD_NUMBER 0 + +#define VER_FILE_VERSION VER_MAJOR_VERSION, VER_MINOR_VERSION, VER_HOTFIX_VERSION, VER_BUILD_NUMBER +#define VER_FILE_VERSION_STR STRINGIZE(VER_MAJOR_VERSION) "." STRINGIZE(VER_MINOR_VERSION) "." STRINGIZE(VER_HOTFIX_VERSION) "." STRINGIZE(VER_BUILD_NUMBER) + +#define VER_PRODUCT_VERSION VER_FILE_VERSION +#define VER_PRODUCT_VERSION_STR VER_FILE_VERSION_STR