From 4b0037ec211360279466b81e6d0590f50916c006 Mon Sep 17 00:00:00 2001
From: coco875 <59367621+coco875@users.noreply.github.com>
Date: Wed, 6 Aug 2025 01:01:21 +0200
Subject: [PATCH] better ninja handle

---
 .github/workflows/windows_build.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
index 082d2d5..7a4196c 100644
--- a/.github/workflows/windows_build.yml
+++ b/.github/workflows/windows_build.yml
@@ -14,16 +14,22 @@ jobs:
         config: [Release, Debug]
         toolchain: [v143, clangcl]
         generate: [Visual Studio 17 2022, Ninja]
+        exclude:
+          - toolchain: clangcl
+            generate: Ninja
     steps:
       - uses: actions/checkout@v4
-      - uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x64
       - name: Build Visual Studio
         if: ${{ matrix.generate == 'Visual Studio 17 2022' }}
         run: |
-          cmake -S . -B "build/x64" -G "${{ matrix.generate }}" -T ${{ matrix.toolchain }} -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }}
+          cmake -S . -B "build/x64" -G "${{ matrix.generate }}" -T ${{ matrix.toolchain }} -A x64 -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }}
           cmake --build ./build/x64
+      - name: Setup Ninja
+        if: ${{ matrix.generate == 'Ninja' }}
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+          toolset: ${{ matrix.toolchain }}
       - name: Build Ninja
         if: ${{ matrix.generate == 'Ninja' }}
         run: |