From aacd4ae548b435dbf223c00f8b5f58ce5ca08d83 Mon Sep 17 00:00:00 2001
From: Bruno Alexandre Rosa <1791393+brunoalr@users.noreply.github.com>
Date: Mon, 2 Mar 2026 21:45:05 -0300
Subject: [PATCH] keep going

---
 .github/workflows/desktop-build.yml | 12 +++++-------
 cockatrice/CMakeLists.txt           |  3 ++-
 oracle/CMakeLists.txt               |  3 ++-
 servatrice/CMakeLists.txt           |  3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index b2075a527..827be92ae 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -335,12 +335,12 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Add msbuild to PATH
+      # Ninja+MSVC requires developer environment; setup-msbuild does not add cl.exe
+      - name: Setup MSVC developer environment
         if: matrix.os == 'Windows'
-        id: add-msbuild
-        uses: microsoft/setup-msbuild@v2
+        uses: ilammy/msvc-dev-cmd@v1
         with:
-          msbuild-architecture: x64
+          arch: x64
 
       - name: Setup ccache
         if: matrix.use_ccache == 1 && matrix.os == 'macOS'
@@ -423,7 +423,6 @@ jobs:
       # uses environment variables, see compile.sh for more details
       - name: Build Cockatrice
         id: build
-        shell: bash
         env:
           BUILDTYPE: '${{matrix.type}}'
           MAKE_PACKAGE: '${{matrix.make_package}}'
@@ -433,14 +432,13 @@ jobs:
           USE_CCACHE: ${{matrix.use_ccache}}
           VCPKG_DISABLE_METRICS: 1
           VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
-          # macOS-specific environment variables, will be ignored on Windows
           MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
           DEVELOPER_DIR: '/Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer'
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
-        run: .ci/compile.sh --server --test --vcpkg
+        run: bash .ci/compile.sh --server --test --vcpkg
 
       - name: Save compiler cache (ccache)
         if: github.ref == 'refs/heads/master' && matrix.use_ccache == 1
diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index d675b809d..aae82c2d2 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -527,8 +527,9 @@ if(WIN32)
   set(plugin_dest_dir Plugins)
   set(qtconf_dest_dir .)
 
+  # Use target runtime dir for both multi-config (VS) and single-config (Ninja)
   install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
+    DIRECTORY "$<TARGET_FILE_DIR:cockatrice>/"
     DESTINATION ./
     FILES_MATCHING
     PATTERN "*.dll"
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 3bb4de5df..486b31175 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -233,8 +233,9 @@ if(WIN32)
   set(qtconf_dest_dir .)
   list(APPEND libSearchDirs ${QT_LIBRARY_DIR})
 
+  # Use target runtime dir for both multi-config (VS) and single-config (Ninja)
   install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
+    DIRECTORY "$<TARGET_FILE_DIR:oracle>/"
     DESTINATION ./
     FILES_MATCHING
     PATTERN "*.dll"
diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index 6e4191beb..083166e7d 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -183,8 +183,9 @@ if(WIN32)
   set(plugin_dest_dir Plugins)
   set(qtconf_dest_dir .)
 
+  # Use target runtime dir for both multi-config (VS) and single-config (Ninja)
   install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
+    DIRECTORY "$<TARGET_FILE_DIR:servatrice>/"
     DESTINATION ./
     FILES_MATCHING
     PATTERN "*.dll"