diff --git a/.github/workflows/ecode-nightly.yml b/.github/workflows/ecode-nightly.yml
index 3f250a618..cdc3bb5fa 100644
--- a/.github/workflows/ecode-nightly.yml
+++ b/.github/workflows/ecode-nightly.yml
@@ -482,9 +482,9 @@ jobs:
     name: Windows x86_64 MSVC Nightly
     needs: release
     runs-on: windows-latest
-    env:
-      MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
     steps:
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v3
     - name: Configure Git
       shell: pwsh
       run: |
@@ -511,9 +511,9 @@ jobs:
     name: Windows arm64 MSVC Nightly
     needs: release
     runs-on: windows-latest
-    env:
-      MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
     steps:
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v3
     - name: Configure Git
       shell: pwsh
       run: |
diff --git a/.github/workflows/eepp-windows-build-check.yml b/.github/workflows/eepp-windows-build-check.yml
index a2bd56246..fb41a19aa 100644
--- a/.github/workflows/eepp-windows-build-check.yml
+++ b/.github/workflows/eepp-windows-build-check.yml
@@ -5,9 +5,9 @@ on: [push, pull_request]
 jobs:
   Windows:
     runs-on: windows-latest
-    env:
-      MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\
     steps:
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v3
     - name: Configure Git
       shell: cmd
       run: |
@@ -32,7 +32,7 @@ jobs:
     - name: Build
       shell: cmd
       run: |
-        "%MSBUILD_PATH%\MSBuild.exe" .\make\windows\eepp.sln -m /p:Platform="x64" /p:Configuration="release"
+        msbuild .\make\windows\eepp.sln -m /p:Platform="x64" /p:Configuration="release"
     - name: Install Mesa for software rendering
       uses: f3d-app/install-mesa-windows-action@v1
       with:
diff --git a/projects/windows/ecode/build.app.ps1 b/projects/windows/ecode/build.app.ps1
index 8b82f0e58..8ad4e990b 100644
--- a/projects/windows/ecode/build.app.ps1
+++ b/projects/windows/ecode/build.app.ps1
@@ -26,7 +26,22 @@ $sdlDll = if ($isSdl3) { "SDL3.dll" } else { "SDL2.dll" }
 
 & $premakeCmd --windows-vc-build --with-backend=$backendArg $(if ($premakeExtra) { $premakeExtra }) --disable-static-build vs2022
 
-& "$env:MSBUILD_PATH/MSBuild.exe" .\make\windows\eepp.sln -m /t:ecode /p:Platform=$msbuildPlat /p:Configuration=release
+$msbuildInPath = Get-Command msbuild -ErrorAction SilentlyContinue
+
+if ($msbuildInPath) {
+  $msbuildCmd = "msbuild"
+} elseif ($env:MSBUILD_PATH) {
+  $msbuildCmd = "$env:MSBUILD_PATH/MSBuild.exe"
+  if (-not (Test-Path $msbuildCmd)) {
+    Write-Error "MSBuild.exe not found at $msbuildCmd"
+    exit 1
+  }
+} else {
+  Write-Error "msbuild not found in PATH and MSBUILD_PATH is not defined"
+  exit 1
+}
+
+& $msbuildCmd .\make\windows\eepp.sln -m /t:ecode /p:Platform=$msbuildPlat /p:Configuration=release
 .\projects\scripts\copy_ecode_assets.ps1 .\bin .\projects\windows\ecode\ecode
 Copy-Item -Path ".\bin\$sdlDll", ".\libs\windows\$archSuffix\eepp.dll", ".\bin\ecode.exe" -Destination ".\projects\windows\ecode\ecode"
 Compress-Archive -LiteralPath ".\projects\windows\ecode\ecode" -DestinationPath .\projects\windows\ecode\ecode-windows-nightly-msvc-$archSuffix.zip -Force
diff --git a/src/thirdparty/SOIL2 b/src/thirdparty/SOIL2
index 9b7d218b2..d6bf0ade3 160000
--- a/src/thirdparty/SOIL2
+++ b/src/thirdparty/SOIL2
@@ -1 +1 @@
-Subproject commit 9b7d218b20a66ec92ee202261f2699222609b45e
+Subproject commit d6bf0ade3f7668581fbdc6e44f35713cd5100d41
diff --git a/src/thirdparty/efsw b/src/thirdparty/efsw
index 347397c0e..c694c94c4 160000
--- a/src/thirdparty/efsw
+++ b/src/thirdparty/efsw
@@ -1 +1 @@
-Subproject commit 347397c0e36165326d445379a06105d3c02e1244
+Subproject commit c694c94c47caff1b3ce41f6b4309426ac354cf7f