diff --git a/build/win64/build-debug.bat b/build/win64/build-debug.bat
index a04cb9984..be62460d0 100644
--- a/build/win64/build-debug.bat
+++ b/build/win64/build-debug.bat
@@ -1,4 +1,8 @@
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
+    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
+) else (
+    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+)
 cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj
 cd ..
diff --git a/build/win64/build-release.bat b/build/win64/build-release.bat
index 8068e5074..695c35a90 100644
--- a/build/win64/build-release.bat
+++ b/build/win64/build-release.bat
@@ -1,4 +1,8 @@
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
+    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
+) else (
+    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+)
 cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=Release ALL_BUILD.vcxproj
 cd ..
diff --git a/build/win64/install-debug.bat b/build/win64/install-debug.bat
index 2724990fc..7d94fef80 100644
--- a/build/win64/install-debug.bat
+++ b/build/win64/install-debug.bat
@@ -1,4 +1,8 @@
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
+    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
+) else (
+    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+)
 cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo INSTALL.vcxproj
 cd ..
diff --git a/build/win64/install-release.bat b/build/win64/install-release.bat
index 30dc1f6ff..0162a8827 100644
--- a/build/win64/install-release.bat
+++ b/build/win64/install-release.bat
@@ -1,4 +1,8 @@
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
+    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
+) else (
+    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+)
 cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=Release INSTALL.vcxproj
 cd ..
diff --git a/build/win64/package-debug.bat b/build/win64/package-debug.bat
index 450db0dfd..d029f9bc3 100644
--- a/build/win64/package-debug.bat
+++ b/build/win64/package-debug.bat
@@ -1,5 +1,9 @@
 @echo off
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
+    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
+) else (
+    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+)
 cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=RelWithDebInfo PACKAGE.vcxproj
 cd ..
diff --git a/build/win64/package-release.bat b/build/win64/package-release.bat
index 1c81ccf92..5c347c3b4 100644
--- a/build/win64/package-release.bat
+++ b/build/win64/package-release.bat
@@ -1,5 +1,9 @@
 @echo off
-call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
+    call "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
+) else (
+    call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+)
 cd VC2022
 msbuild /m /p:Platform=x64 /p:Configuration=Release PACKAGE.vcxproj
 cd ..