GHA Build cleanups

.github/workflows/cmake_windows_msys2.yml

@@ -1,4 +1,4 @@
-name: CMake (Windows, msys2)
+name: CMake (Windows)
 
 on:
 
@@ -26,9 +26,9 @@ on:
 
 jobs:
 
-  msys2:
+  windows:
 
-    name: "${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
+    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
 
     runs-on: ${{ matrix.environment.runner }}
 
@@ -56,14 +56,15 @@ jobs:
             new: on
             slug: -NDR
         ui:
-          - name: Qt GUI
+          - name: Qt 5 GUI
             qt: on
+            slug: -Qt5
             static: on
-            slug: -Qt
             packages: >-
-              qt5-base:p
-              qt5-tools:p
+              qt5-static:p
               vulkan-headers:p
+#              qt5-base:p
+#              qt5-tools:p
         environment:
 #          - msystem: MSYS
 #            toolchain: ./cmake/flags-gcc-x86_64.cmake
@@ -77,10 +78,12 @@ jobs:
 #            prefix: mingw-w64-clang-x86_64
 #            toolchain: ./cmake/llvm-win32-x86_64.cmake
 #            slug: "CLANG64"
+#            runner: windows-2022
 #          - msystem: UCRT64
 #            prefix: mingw-w64-ucrt-x86_64
 #            toolchain: ./cmake/flags-gcc-x86_64.cmake
 #            slug: "UCRT64"
+#            runner: windows-2022
           - msystem: CLANGARM64
             toolchain: ./cmake/flags-gcc-aarch64.cmake
             slug: -arm64
@@ -112,8 +115,7 @@ jobs:
             libslirp:p
             fluidsynth:p
             libserialport:p
-            qt5-static:p
-            vulkan-headers:p
+            ${{ matrix.ui.packages }}
             openmp:p
 
       - name: Checkout repository
@@ -123,10 +125,10 @@ jobs:
 
       - name: Configure CMake
         run: >-
-          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
+          cmake -S . -B build --preset ${{ matrix.build.preset }}
           --toolchain ${{ matrix.environment.toolchain }}
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
-          -D CMAKE_INSTALL_PREFIX=./build/artifacts
+          -D QT=${{ matrix.ui.qt }}
 
       - name: Build
         run: cmake --build build