[fix] correct version display in about window

This commit is contained in:
dijunkun
2025-10-23 23:01:38 +08:00
parent 3638b712bd
commit 0bf83f07ad
3 changed files with 17 additions and 6 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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")