CodeQL Build Cleanups

.github/workflows/codeql_macos.yml

@@ -31,11 +31,11 @@ on:
 
 jobs:
 
-  analyze-macos13-x86_64:
+  analyze-macos:
 
-    name: "Analyze (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, x86_64)"
+    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.arch }}"
 
-    runs-on: macos-13
+    runs-on: ${{ matrix.environment.runner }}
 
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
@@ -66,13 +66,29 @@ jobs:
             new: on
             slug: -NDR
         ui:
-          - name: SDL GUI
-            qt: off
-          - name: Qt GUI
+#          - name: SDL GUI
+#            qt: off
+#            slug: -SDL
+#            static: on
+          - name: Qt 5 GUI
             qt: on
-            slug: -Qt
+            slug: -Qt5
             packages: >-
               qt@5
+        environment:
+          - arch: x86_64
+            toolchain: ./cmake/flags-gcc-x86_64.cmake
+            slug: -x86_64
+            runner: macos-13
+#          - arch: arm64
+#            toolchain: ./cmake/llvm-macos-aarch64.cmake
+#            slug: -arm64
+#            runner: macos-14
+#        exclude:
+#          - dynarec:
+#              new: off
+#            environment:
+#              arch: arm64
 
     steps:
       - name: Install dependencies
@@ -103,10 +119,9 @@ jobs:
 
       - name: Configure CMake
         run: >-
-          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
-          --toolchain ./cmake/flags-gcc-x86_64.cmake
+          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 }}
           -D Qt5_ROOT=$(brew --prefix qt@5)
           -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)