From 0bf83f07ad2ed2c205d8f5d6e23b6294b03ee1b5 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Thu, 23 Oct 2025 23:01:38 +0800 Subject: [PATCH] [fix] correct version display in about window --- .github/workflows/build.yml | 10 ++++++++-- src/gui/windows/about_window.cpp | 4 ++-- xmake.lua | 9 +++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa2e4a7..296aff2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,6 +52,7 @@ jobs: XMAKE_GLOBALDIR: /data run: | ls -la $XMAKE_GLOBALDIR + xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} xmake b -vy --root crossdesk - name: Decode and save certificate @@ -113,6 +114,7 @@ jobs: CUDA_PATH: /usr/local/cuda XMAKE_GLOBALDIR: /data run: | + xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} xmake b -vy --root crossdesk - name: Decode and save certificate @@ -177,7 +179,9 @@ jobs: run: git submodule update --init --recursive - name: Build CrossDesk - run: xmake b -vy crossdesk + run: | + xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} + xmake b -vy crossdesk - name: Decode and save certificate shell: bash @@ -281,7 +285,9 @@ jobs: copy "${{ github.workspace }}\scripts\windows\nsProcess.dll" $nsisPluginDir - name: Build CrossDesk - run: xmake b -vy crossdesk + run: | + xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} + xmake b -vy crossdesk - name: Decode and save certificate shell: powershell diff --git a/src/gui/windows/about_window.cpp b/src/gui/windows/about_window.cpp index ed22046..8a5eb08 100644 --- a/src/gui/windows/about_window.cpp +++ b/src/gui/windows/about_window.cpp @@ -27,8 +27,8 @@ int Render::AboutWindow() { ImGui::SetWindowFontScale(0.5f); std::string version; -#ifdef RD_VERSION - version = RD_VERSION; +#ifdef CROSSDESK_VERSION + version = CROSSDESK_VERSION; #else version = "Unknown"; #endif diff --git a/xmake.lua b/xmake.lua index 361e90b..16a5b2a 100644 --- a/xmake.lua +++ b/xmake.lua @@ -1,8 +1,13 @@ set_project("crossdesk") set_license("LGPL-3.0") -set_version("0.0.1") -add_defines("RD_VERSION=\"0.0.1\""); +option("CROSSDESK_VERSION") + set_default("0.0.0") + set_showmenu(true) + set_description("Set CROSSDESK_VERSION for build") +option_end() + +add_defines("CROSSDESK_VERSION=\"" .. (get_config("CROSSDESK_VERSION") or "Unknown") .. "\"") add_rules("mode.release", "mode.debug") set_languages("c++17")