YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 12:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] correct version display in about window

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View File

@@ -52,6 +52,7 @@ jobs:
XMAKE_GLOBALDIR: /data XMAKE_GLOBALDIR: /data
run: | run: |
ls -la $XMAKE_GLOBALDIR ls -la $XMAKE_GLOBALDIR
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION}
xmake b -vy --root crossdesk xmake b -vy --root crossdesk
- name: Decode and save certificate - name: Decode and save certificate
@@ -113,6 +114,7 @@ jobs:
CUDA_PATH: /usr/local/cuda CUDA_PATH: /usr/local/cuda
XMAKE_GLOBALDIR: /data XMAKE_GLOBALDIR: /data
run: | run: |
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION}
xmake b -vy --root crossdesk xmake b -vy --root crossdesk
- name: Decode and save certificate - name: Decode and save certificate
@@ -177,7 +179,9 @@ jobs:
run: git submodule update --init --recursive run: git submodule update --init --recursive
- name: Build CrossDesk - name: Build CrossDesk
run: xmake b -vy crossdesk run: |
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION}
xmake b -vy crossdesk
- name: Decode and save certificate - name: Decode and save certificate
shell: bash shell: bash
@@ -281,7 +285,9 @@ jobs:
copy "${{ github.workspace }}\scripts\windows\nsProcess.dll" $nsisPluginDir copy "${{ github.workspace }}\scripts\windows\nsProcess.dll" $nsisPluginDir
- name: Build CrossDesk - name: Build CrossDesk
run: xmake b -vy crossdesk run: |
xmake f --CROSSDESK_VERSION=${LEGAL_VERSION}
xmake b -vy crossdesk
- name: Decode and save certificate - name: Decode and save certificate
shell: powershell shell: powershell

4
src/gui/windows/about_window.cpp
View File

@@ -27,8 +27,8 @@ int Render::AboutWindow() {
ImGui::SetWindowFontScale(0.5f); ImGui::SetWindowFontScale(0.5f);
std::string version; std::string version;
#ifdef RD_VERSION #ifdef CROSSDESK_VERSION
version = RD_VERSION; version = CROSSDESK_VERSION;
#else #else
version = "Unknown"; version = "Unknown";
#endif #endif

9
xmake.lua
View File

@@ -1,8 +1,13 @@
set_project("crossdesk") set_project("crossdesk")
set_license("LGPL-3.0") set_license("LGPL-3.0")
set_version("0.0.1") option("CROSSDESK_VERSION")
add_defines("RD_VERSION=\"0.0.1\""); 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") add_rules("mode.release", "mode.debug")
set_languages("c++17") set_languages("c++17")