From 49b586f62ea332fa5fca8400b3604390f578b162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=81=8D=E5=85=AE=E6=83=9A=E5=85=AE?=
 <101191390+HIllya51@users.noreply.github.com>
Date: Fri, 26 Apr 2024 18:31:20 +0800
Subject: [PATCH] fix

---
 .github/workflows/release.yml | 41 ++++++++++++++---------------------
 scripts/build32xp.bat         |  4 ++--
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3e86460..69888cb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,15 +20,11 @@ jobs:
         uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
         with:
           sdk-version: 22621
-      - name: Install Qt32
-        uses: jurplel/install-qt-action@v3.3.0
+      - name: Install Python 3.11
+        uses: actions/setup-python@v5
         with:
-          version:      ${{ env.QT_VERSION }}
-          host:         windows
-          target:       desktop
-          arch:         win32_msvc2019
-          dir:          ${{ runner.temp }}
-          setup-python: true
+          python-version: '3.11'
+          architecture: x64
       - name: Run build script 32xp
         run: python build.py 32xp
 
@@ -42,12 +38,12 @@ jobs:
       - name: Upload English xp artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Release_English_xp
+          name: Release_English_xp.zip
           path: builds/Release_English_xp.zip
       - name: Upload Chinese xp artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Release_Chinese_xp
+          name: Release_Chinese_xp.zip
           path: builds/Release_Chinese_xp.zip
 
   build:
@@ -89,22 +85,22 @@ jobs:
       - name: Upload plugin32 artifact
         uses: actions/upload-artifact@v4
         with:
-          name: plugin32
+          name: plugin32.zip
           path: builds/plugin32.zip
       - name: Upload plugin64 artifact
         uses: actions/upload-artifact@v4
         with:
-          name: plugin64
+          name: plugin64.zip
           path: builds/plugin64.zip
       - name: Upload English artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Release_English
+          name: Release_English.zip
           path: builds/Release_English.zip
       - name: Upload Chinese artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Release_Chinese
+          name: Release_Chinese.zip
           path: builds/Release_Chinese.zip
   release:
     needs: [build, build_xp]
@@ -115,37 +111,32 @@ jobs:
       - name: Download plugin32 artifact
         uses: actions/download-artifact@v4
         with:
-          name: plugin32
+          name: plugin32.zip
           path: builds
       - name: Download plugin64 artifact
         uses: actions/download-artifact@v4
         with:
-          name: plugin64
+          name: plugin64.zip
           path: builds
       - name: Download English artifact
         uses: actions/download-artifact@v4
         with:
-          name: Release_English
+          name: Release_English.zip
           path: builds
       - name: Download Chinese artifact
         uses: actions/download-artifact@v4
         with:
-          name: Release_Chinese
+          name: Release_Chinese.zip
           path: builds
-      # - name: Download plugin32_xp artifact
-      #   uses: actions/download-artifact@v4
-      #   with:
-      #     name: plugin32_xp
-      #     path: builds
       - name: Download English xp artifact
         uses: actions/download-artifact@v4
         with:
-          name: Release_English_xp
+          name: Release_English_xp.zip
           path: builds
       - name: Download Chinese xp artifact
         uses: actions/download-artifact@v4
         with:
-          name: Release_Chinese_xp
+          name: Release_Chinese_xp.zip
           path: builds
       - name: Release LunaHook
         uses: softprops/action-gh-release@v2
diff --git a/scripts/build32xp.bat b/scripts/build32xp.bat
index b4c3deb..5bedb3f 100644
--- a/scripts/build32xp.bat
+++ b/scripts/build32xp.bat
@@ -1,7 +1,7 @@
-cmake ../CMakeLists.txt -G "Visual Studio 16 2019" -A win32 -T v141_xp -B ../build/x86_xp
+cmake -DWINXP=1 ../CMakeLists.txt -G "Visual Studio 16 2019" -A win32 -T v141_xp -B ../build/x86_xp
 cmake --build ../build/x86_xp --config Release --target ALL_BUILD -j 14
 
-cmake -DLANGUAGE=Chinese ../CMakeLists.txt -G "Visual Studio 16 2019" -A win32 -T v141_xp -B ../build/x86_zh_xp
+cmake -DWINXP=1 -DLANGUAGE=Chinese ../CMakeLists.txt -G "Visual Studio 16 2019" -A win32 -T v141_xp -B ../build/x86_zh_xp
 cmake --build ../build/x86_zh_xp --config Release --target ALL_BUILD -j 14
 python edit_target.py