From 066ffa46e2f003bbb73ea84598c221ef6005dc1c Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Wed, 15 Oct 2025 19:01:18 -0400
Subject: [PATCH] remove ninja for windows ci/release

---
 .github/workflows/ci.yml      | 10 +++++-----
 .github/workflows/release.yml |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5871d13..1017847b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,7 +111,7 @@ jobs:
       if: runner.os == 'Windows'
       shell: pwsh
       run: |
-        choco install --no-progress -y nasm ninja ccache
+        choco install --no-progress -y nasm ccache
         if ($env:ChocolateyInstall) {
           $profilePath = Join-Path $env:ChocolateyInstall "helpers\chocolateyProfile.psm1"
           if (Test-Path $profilePath) {
@@ -286,7 +286,6 @@ jobs:
         $cmakeArgs = @(
           "-S", ".",
           "-B", "build",
-          "-G", "Ninja",
           "-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}",
           "-DCMAKE_TOOLCHAIN_FILE=$toolchain",
           "-DVCPKG_TARGET_TRIPLET=x64-windows-static",
@@ -296,8 +295,7 @@ jobs:
           "-DYAZE_BUILD_Z3ED=ON",
           "-DYAZE_BUILD_TOOLS=ON",
           "-DYAZE_ENABLE_ROM_TESTS=OFF",
-          "-DCMAKE_CXX_FLAGS=/Dgoogle_protobuf_undef_DWORD=1 /D__PRFCHWINTRIN_H /DGOOGLE_PROTOBUF_NO_RTTI /DPROTOBUF_FORCE_COPY_IN_SWAP",
-          "-DCMAKE_C_FLAGS=/Dgoogle_protobuf_undef_DWORD=1 /D__PRFCHWINTRIN_H /DGOOGLE_PROTOBUF_NO_RTTI /DPROTOBUF_FORCE_COPY_IN_SWAP"
+          "-DVCPKG_INSTALL_OPTIONS=--x-feature=pkgconfig"
         )
 
         cmake @cmakeArgs 2>&1 | Tee-Object -FilePath cmake_config.log
@@ -382,7 +380,7 @@ jobs:
         if [[ "${{ runner.os }}" == "Windows" ]]; then
           JOBS=${CMAKE_BUILD_PARALLEL_LEVEL:-4}
           echo "Using $JOBS parallel jobs"
-          cmake --build build --parallel "${JOBS}" 2>&1 | tee build.log
+          cmake --build build --config "${BUILD_TYPE}" --parallel "${JOBS}" 2>&1 | tee build.log
         else
           # Determine number of parallel jobs based on platform
           if command -v nproc >/dev/null 2>&1; then
@@ -495,6 +493,7 @@ jobs:
     - name: Test (Stable)
       id: test_stable
       working-directory: build
+      shell: bash
       run: |
         BUILD_TYPE=${BUILD_TYPE:-${{ env.BUILD_TYPE }}}
         echo "Running stable test suite..."
@@ -506,6 +505,7 @@ jobs:
       id: test_experimental
       working-directory: build
       continue-on-error: true
+      shell: bash
       run: |
         BUILD_TYPE=${BUILD_TYPE:-${{ env.BUILD_TYPE }}}
         echo "Running experimental test suite (informational only)..."
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 00866b2d..78bee882 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Install build tools
         shell: pwsh
         run: |
-          choco install --no-progress -y nasm ninja
+          choco install --no-progress -y nasm
           "C:\Program Files\NASM" | Out-File -FilePath $env:GITHUB_PATH -Append
 
       - name: Setup MSVC
@@ -51,17 +51,18 @@ jobs:
         shell: pwsh
         run: |
           $toolchain = "${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake"
-          cmake -S . -B build -G Ninja `
+          cmake -S . -B build `
             -DCMAKE_BUILD_TYPE=Release `
             -DCMAKE_TOOLCHAIN_FILE=$toolchain `
             -DVCPKG_TARGET_TRIPLET=x64-windows-static `
             -DYAZE_BUILD_TESTS=OFF `
             -DYAZE_BUILD_EMU=ON `
             -DYAZE_BUILD_Z3ED=ON `
-            -DYAZE_BUILD_TOOLS=ON
+            -DYAZE_BUILD_TOOLS=ON `
+            -DVCPKG_INSTALL_OPTIONS="--x-feature=pkgconfig"
 
       - name: Build
-        run: cmake --build build --config Release --parallel 4
+        run: cmake --build build --config Release --parallel 4 -- /p:CL_MPcount=4
 
       - name: Package
         shell: pwsh