diff --git a/packages/bzip2/1.0.8/targets.toml b/packages/bzip2/1.0.8/targets.toml
index bd5d05b..64f286a 100644
--- a/packages/bzip2/1.0.8/targets.toml
+++ b/packages/bzip2/1.0.8/targets.toml
@@ -18,3 +18,4 @@ size = 810029
 [targets.unix]
 
 [targets.windows]
+build_requirements = ["msvc"]
diff --git a/packages/bzip2/build.bat b/packages/bzip2/build.bat
index c4d51ff..6d09d79 100644
--- a/packages/bzip2/build.bat
+++ b/packages/bzip2/build.bat
@@ -1,35 +1,7 @@
 cd bzip2-%PACKIT_PACKAGE_VERSION%
 
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL%
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH%
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%
 
 nmake -f makefile.msc 
 if ERRORLEVEL 1 (
diff --git a/packages/cmake/4.3.3/targets.toml b/packages/cmake/4.3.3/targets.toml
index c588895..9f01a0a 100644
--- a/packages/cmake/4.3.3/targets.toml
+++ b/packages/cmake/4.3.3/targets.toml
@@ -33,3 +33,4 @@ source = "unix"
 
 [targets.windows]
 source = "windows"
+build_requirements = ["msvc"]
diff --git a/packages/cmake/build.bat b/packages/cmake/build.bat
index 6186d8c..1bd14ea 100644
--- a/packages/cmake/build.bat
+++ b/packages/cmake/build.bat
@@ -1,35 +1,7 @@
 cd cmake-%PACKIT_PACKAGE_VERSION%
 
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL%
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH%
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%
 
 REM Bootstrap cmake
 powershell -File .\bootstrap.ps1 -prefix "%PACKIT_PACKAGE_PATH%" -no-system-libs -no-debugger
diff --git a/packages/expat/2.8.2/targets.toml b/packages/expat/2.8.2/targets.toml
index 3d1c07a..5c3e4b8 100644
--- a/packages/expat/2.8.2/targets.toml
+++ b/packages/expat/2.8.2/targets.toml
@@ -13,3 +13,4 @@ size = 818391
 
 [targets.windows]
 build_dependencies = ["cmake"]
+test_requirements = ["msvc"]
diff --git a/packages/expat/test.bat b/packages/expat/test.bat
index 31a18f7..bd61b70 100644
--- a/packages/expat/test.bat
+++ b/packages/expat/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" libexpat.lib %PACKIT_OUTPUTS% >&3 2>&3
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
diff --git a/packages/libgit2/1.9.6/targets.toml b/packages/libgit2/1.9.6/targets.toml
index 7a52743..6a7e7f2 100644
--- a/packages/libgit2/1.9.6/targets.toml
+++ b/packages/libgit2/1.9.6/targets.toml
@@ -16,3 +16,4 @@ dependencies = ["openssl", "zlib-ng-compat", "pcre2"]
 
 [targets.windows]
 dependencies = ["zlib-ng-compat"]
+test_requirements = ["msvc"]
diff --git a/packages/libgit2/test.bat b/packages/libgit2/test.bat
index cb94508..db66f83 100644
--- a/packages/libgit2/test.bat
+++ b/packages/libgit2/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" git2.lib %PACKIT_OUTPUTS% >&3 2>&3
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
diff --git a/packages/libpng/1.6.57/targets.toml b/packages/libpng/1.6.57/targets.toml
index 7edab76..c5f8d33 100644
--- a/packages/libpng/1.6.57/targets.toml
+++ b/packages/libpng/1.6.57/targets.toml
@@ -16,3 +16,5 @@ dependencies = ["zlib-ng-compat"]
 
 [targets.windows]
 dependencies = ["zlib-ng-compat"]
+build_requirements = ["msvc"]
+test_requirements = ["msvc"]
diff --git a/packages/libpng/build.bat b/packages/libpng/build.bat
index 3423f3d..776d3dd 100644
--- a/packages/libpng/build.bat
+++ b/packages/libpng/build.bat
@@ -1,34 +1,7 @@
 cd libpng-%PACKIT_PACKAGE_VERSION%
 
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL%
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH%
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%
 
 if "%PACKIT_TARGET%" == "x86_64-pc-windows-msvc" (
     nmake -f scripts\makefile.vcwin32 CFLAGS="/I\"%PACKIT_PACKAGE_DEPENDENCIES_PATH%\zlib-ng-compat\include\""
diff --git a/packages/libpng/test.bat b/packages/libpng/test.bat
index c7963ea..3704624 100644
--- a/packages/libpng/test.bat
+++ b/packages/libpng/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" libpng.lib "%PACKIT_PACKAGE_DEPENDENCIES_PATH%\zlib-ng-compat\lib\zlib.lib" %PACKIT_OUTPUTS% >&3 2>&3
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
diff --git a/packages/libssh2/1.11.1/targets.toml b/packages/libssh2/1.11.1/targets.toml
index 2793048..b8ce7ea 100644
--- a/packages/libssh2/1.11.1/targets.toml
+++ b/packages/libssh2/1.11.1/targets.toml
@@ -19,3 +19,4 @@ dependencies = ["zlib-ng-compat"]
 
 [targets.windows]
 build_dependencies = ["cmake@>=3.18"]
+test_requirements = ["msvc"]
diff --git a/packages/libssh2/test.bat b/packages/libssh2/test.bat
index 1e2345e..e464a5b 100644
--- a/packages/libssh2/test.bat
+++ b/packages/libssh2/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" libssh2.lib %PACKIT_OUTPUTS% >&3 2>&3
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
diff --git a/packages/llhttp/9.4.1/targets.toml b/packages/llhttp/9.4.1/targets.toml
index e768469..c401598 100644
--- a/packages/llhttp/9.4.1/targets.toml
+++ b/packages/llhttp/9.4.1/targets.toml
@@ -12,3 +12,4 @@ size = 40396
 [targets.unix]
 
 [targets.windows]
+test_requirements = ["msvc"]
diff --git a/packages/llhttp/test.bat b/packages/llhttp/test.bat
index bb4d260..e73f42f 100644
--- a/packages/llhttp/test.bat
+++ b/packages/llhttp/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" llhttp.lib %PACKIT_OUTPUTS% >&3 2>&3
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
diff --git a/packages/make/4.4.1/targets.toml b/packages/make/4.4.1/targets.toml
index dbf5ba1..9858716 100644
--- a/packages/make/4.4.1/targets.toml
+++ b/packages/make/4.4.1/targets.toml
@@ -19,3 +19,4 @@ size = 2348200
 build_script = "macos_build"
 
 [targets.windows]
+build_requirements = ["msvc"] # The build_w32.bat script expects to find MSVC
diff --git a/packages/make/4.4/targets.toml b/packages/make/4.4/targets.toml
index 990bfa1..0115848 100644
--- a/packages/make/4.4/targets.toml
+++ b/packages/make/4.4/targets.toml
@@ -19,3 +19,4 @@ size = 2307891
 build_script = "macos_build"
 
 [targets.windows]
+build_requirements = ["msvc"] # The build_w32.bat script expects to find MSVC
diff --git a/packages/make/build.bat b/packages/make/build.bat
index 0a40a18..197b468 100644
--- a/packages/make/build.bat
+++ b/packages/make/build.bat
@@ -1,5 +1,8 @@
 cd make-%PACKIT_PACKAGE_VERSION%
 
+REM Call vcvarsall.bat to initialize MSVC build environment (the automatic detection does not always work reliably)
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
+
 call build_w32.bat --without-guile
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
 
diff --git a/packages/mpdecimal/4.0.1/targets.toml b/packages/mpdecimal/4.0.1/targets.toml
index 1ee626b..e9243e3 100644
--- a/packages/mpdecimal/4.0.1/targets.toml
+++ b/packages/mpdecimal/4.0.1/targets.toml
@@ -13,3 +13,5 @@ size = 316268
 
 [targets.windows]
 build_dependencies = ["cmake"]
+build_requirements = ["msvc"]
+test_requirements = ["msvc"]
diff --git a/packages/mpdecimal/build.bat b/packages/mpdecimal/build.bat
index c97ea2e..754bf0e 100644
--- a/packages/mpdecimal/build.bat
+++ b/packages/mpdecimal/build.bat
@@ -1,35 +1,7 @@
 cd mpdecimal-%PACKIT_PACKAGE_VERSION%
 
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL%
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH%
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%
 
 set "MACHINE=x64"
 if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
diff --git a/packages/mpdecimal/test.bat b/packages/mpdecimal/test.bat
index 4d2bed8..ab023d0 100644
--- a/packages/mpdecimal/test.bat
+++ b/packages/mpdecimal/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 REM Compile test.c
 cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" libmpdec.lib %PACKIT_OUTPUTS% >&3 2>&3
diff --git a/packages/nasm/3.01/targets.toml b/packages/nasm/3.01/targets.toml
index c070a17..acaa2eb 100644
--- a/packages/nasm/3.01/targets.toml
+++ b/packages/nasm/3.01/targets.toml
@@ -15,3 +15,5 @@ test_script = "linux_test"
 test_script = "macos_test"
 
 [targets.windows]
+build_requirements = ["msvc"]
+test_requirements = ["msvc"]
diff --git a/packages/nasm/build.bat b/packages/nasm/build.bat
index 437410f..5cc2e1e 100644
--- a/packages/nasm/build.bat
+++ b/packages/nasm/build.bat
@@ -1,34 +1,7 @@
 cd nasm-%PACKIT_PACKAGE_VERSION%
 
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL%
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH%
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%
 
 nmake /f Mkfiles/msvc.mak prefix="%PACKIT_PACKAGE_PATH%"
 if ERRORLEVEL 1 (
diff --git a/packages/nasm/test.bat b/packages/nasm/test.bat
index b7ffecb..3182080 100644
--- a/packages/nasm/test.bat
+++ b/packages/nasm/test.bat
@@ -1,31 +1,5 @@
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 REM Hello example from https://cs.lmu.edu/~ray/notes/nasmtutorial/
 (
diff --git a/packages/openssl/3.6.2/targets.toml b/packages/openssl/3.6.2/targets.toml
index 45304a6..2bc1f5f 100644
--- a/packages/openssl/3.6.2/targets.toml
+++ b/packages/openssl/3.6.2/targets.toml
@@ -17,6 +17,8 @@ build_dependencies = ["perl"]
 
 [targets.windows]
 build_dependencies = ["perl"]
+build_requirements = ["msvc"]
 
 [targets.x86_64-pc-windows-msvc]
 build_dependencies = ["perl", "nasm"]
+build_requirements = ["msvc"]
diff --git a/packages/openssl/3.6.3/targets.toml b/packages/openssl/3.6.3/targets.toml
index 761361a..11b7d06 100644
--- a/packages/openssl/3.6.3/targets.toml
+++ b/packages/openssl/3.6.3/targets.toml
@@ -17,6 +17,8 @@ build_dependencies = ["perl"]
 
 [targets.windows]
 build_dependencies = ["perl"]
+build_requirements = ["msvc"]
 
 [targets.x86_64-pc-windows-msvc]
 build_dependencies = ["perl", "nasm"]
+build_requirements = ["msvc"]
diff --git a/packages/openssl/4.0.0/targets.toml b/packages/openssl/4.0.0/targets.toml
index f7e82c4..9abbe02 100644
--- a/packages/openssl/4.0.0/targets.toml
+++ b/packages/openssl/4.0.0/targets.toml
@@ -17,6 +17,8 @@ build_dependencies = ["perl"]
 
 [targets.windows]
 build_dependencies = ["perl"]
+build_requirements = ["msvc"]
 
 [targets.x86_64-pc-windows-msvc]
 build_dependencies = ["perl", "nasm"]
+build_requirements = ["msvc"]
diff --git a/packages/openssl/4.0.1/targets.toml b/packages/openssl/4.0.1/targets.toml
index 8b2025b..6ae196b 100644
--- a/packages/openssl/4.0.1/targets.toml
+++ b/packages/openssl/4.0.1/targets.toml
@@ -17,6 +17,8 @@ build_dependencies = ["perl"]
 
 [targets.windows]
 build_dependencies = ["perl"]
+build_requirements = ["msvc"]
 
 [targets.x86_64-pc-windows-msvc]
 build_dependencies = ["perl", "nasm"]
+build_requirements = ["msvc"]
diff --git a/packages/openssl/build.bat b/packages/openssl/build.bat
index 62829f9..844282c 100644
--- a/packages/openssl/build.bat
+++ b/packages/openssl/build.bat
@@ -1,43 +1,17 @@
 cd openssl-%PACKIT_PACKAGE_VERSION%
 
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL%
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%
 
-REM Retrieve architecture from target
 if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-    set CONFIGURETARGET=VC-WIN64A
+    perl configure VC-WIN64A "--prefix=%PACKIT_PACKAGE_PATH%" "--openssldir=%PACKIT_PREFIX_PATH%/etc/openssl@%PACKIT_PACKAGE_VERSION%"
 ) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-    set CONFIGURETARGET=VC-WIN64-ARM
+    perl configure VC-WIN64-ARM no-asm "--prefix=%PACKIT_PACKAGE_PATH%" "--openssldir=%PACKIT_PREFIX_PATH%/etc/openssl@%PACKIT_PACKAGE_VERSION%"
 ) else (
     echo Target %PACKIT_TARGET% is not supported for this package
     exit /b 1
 )
 
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH%
-
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    perl configure %CONFIGURETARGET% "--prefix=%PACKIT_PACKAGE_PATH%" "--openssldir=%PACKIT_PREFIX_PATH%/etc/openssl@%PACKIT_PACKAGE_VERSION%"
-) else (
-    perl configure %CONFIGURETARGET% no-asm "--prefix=%PACKIT_PACKAGE_PATH%" "--openssldir=%PACKIT_PREFIX_PATH%/etc/openssl@%PACKIT_PACKAGE_VERSION%"
-)
-
 nmake
 if ERRORLEVEL 1 (
     echo OpenSSL build failed
diff --git a/packages/pcre2/10.47/targets.toml b/packages/pcre2/10.47/targets.toml
index 6cfac2f..45da488 100644
--- a/packages/pcre2/10.47/targets.toml
+++ b/packages/pcre2/10.47/targets.toml
@@ -19,3 +19,4 @@ build_dependencies = ["autoconf", "automake", "libtool", "pkgconf"]
 [targets.windows]
 dependencies = ["bzip2", "zlib-ng-compat"]
 build_dependencies = ["cmake"]
+test_requirements = ["msvc"]
diff --git a/packages/pcre2/test.bat b/packages/pcre2/test.bat
index e384a30..6405cf4 100644
--- a/packages/pcre2/test.bat
+++ b/packages/pcre2/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 REM Compile test.c
 cl /I "%PACKIT_PACKAGE_PATH%\include" test.c /Fe:test.exe /link /LIBPATH:"%PACKIT_PACKAGE_PATH%\lib" pcre2-8.lib %PACKIT_OUTPUTS% >&3 2>&3
diff --git a/packages/perl/5.42.2/targets.toml b/packages/perl/5.42.2/targets.toml
index 640a3bc..b7f9938 100644
--- a/packages/perl/5.42.2/targets.toml
+++ b/packages/perl/5.42.2/targets.toml
@@ -18,3 +18,4 @@ size = 20609653
 [targets.unix]
 
 [targets.windows]
+build_requirements = ["msvc"]
diff --git a/packages/perl/build.bat b/packages/perl/build.bat
index d3142c3..492b6d1 100644
--- a/packages/perl/build.bat
+++ b/packages/perl/build.bat
@@ -2,47 +2,14 @@ cd perl-%PACKIT_PACKAGE_VERSION%
 
 cd win32
 
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL%
-
-REM Read MSVC version
-for /f "usebackq" %%v in ("%VSPATH%\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt") do (
-    set "MSVCVERSION=%%v"
-)
-echo Found MSVC version %MSVCVERSION%
-
 REM Convert MSVC version for make variable
-set "MSVCMAJOR=%MSVCVERSION:~0,2%"
-set "MSVCMINOR=%MSVCVERSION:~3,1%"
+set "MSVCMAJOR=%PACKIT_MSVC_VERSION:~0,2%"
+set "MSVCMINOR=%PACKIT_MSVC_VERSION:~3,1%"
 set "MSVCNAME=MSVC%MSVCMAJOR%%MSVCMINOR%"
 echo Found MSCV name %MSVCNAME%
 
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH%
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%
 
 REM Patch Makefile to include quotes in install path
 powershell -NoProfile -Command ^
diff --git a/packages/sqlite/3.53.2/targets.toml b/packages/sqlite/3.53.2/targets.toml
index 15d35ab..840e14b 100644
--- a/packages/sqlite/3.53.2/targets.toml
+++ b/packages/sqlite/3.53.2/targets.toml
@@ -20,3 +20,4 @@ dependencies = ["readline"]
 skip_symlinking = true
 
 [targets.windows]
+build_requirements = ["msvc"]
diff --git a/packages/sqlite/build.bat b/packages/sqlite/build.bat
index dd87f06..d5946b1 100644
--- a/packages/sqlite/build.bat
+++ b/packages/sqlite/build.bat
@@ -1,34 +1,7 @@
 cd sqlite-autoconf-%PACKIT_ARGS_ARCHIVE_VERSION%
 
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL%
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH%
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%
 
 set "OPTIONS="
 set "OPTIONS=%OPTIONS% /DSQLITE_ENABLE_API_ARMOR=1"
diff --git a/packages/zlib-ng-compat/2.3.3/targets.toml b/packages/zlib-ng-compat/2.3.3/targets.toml
index ae31768..8f637ed 100644
--- a/packages/zlib-ng-compat/2.3.3/targets.toml
+++ b/packages/zlib-ng-compat/2.3.3/targets.toml
@@ -16,3 +16,4 @@ skip_symlinking = true
 
 [targets.windows]
 build_dependencies = ["cmake"]
+test_requirements = ["msvc"]
diff --git a/packages/zlib-ng-compat/test.bat b/packages/zlib-ng-compat/test.bat
index 76331e4..e4e436b 100644
--- a/packages/zlib-ng-compat/test.bat
+++ b/packages/zlib-ng-compat/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 set TEST_TEXT = "Hello World! Duck, Mouse, Bird, Dog, Horse, idk, that's all the animals I know. I hope it's enough for this test code :)"
 echo "%TEST_TEXT%" > test.txt
diff --git a/packages/zlib-ng/2.3.3/targets.toml b/packages/zlib-ng/2.3.3/targets.toml
index 06693b5..e232cab 100644
--- a/packages/zlib-ng/2.3.3/targets.toml
+++ b/packages/zlib-ng/2.3.3/targets.toml
@@ -13,3 +13,4 @@ size = 2447397
 
 [targets.windows]
 build_dependencies = ["cmake"]
+test_requirements = ["msvc"]
diff --git a/packages/zlib-ng/test.bat b/packages/zlib-ng/test.bat
index 001d696..7105a87 100644
--- a/packages/zlib-ng/test.bat
+++ b/packages/zlib-ng/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 set TEST_TEXT = "Hello World! Duck, Mouse, Bird, Dog, Horse, idk, that's all the animals I know. I hope it's enough for this test code :)"
 echo "%TEST_TEXT%" > test.txt
diff --git a/packages/zlib/1.3.2/targets.toml b/packages/zlib/1.3.2/targets.toml
index bc270a1..19318ba 100644
--- a/packages/zlib/1.3.2/targets.toml
+++ b/packages/zlib/1.3.2/targets.toml
@@ -13,5 +13,7 @@ checksum = "bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16"
 size = 1502830
 
 [targets.windows]
+build_requirements = ["msvc"]
+test_requirements = ["msvc"]
 
 [targets.unix]
diff --git a/packages/zlib/build.bat b/packages/zlib/build.bat
index 5013f76..4c43e5d 100644
--- a/packages/zlib/build.bat
+++ b/packages/zlib/build.bat
@@ -1,34 +1,7 @@
 cd zlib-%PACKIT_PACKAGE_VERSION%
 
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL%
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH%
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH%
 
 REM Patch Makefile on ARM64 systems to remove the base option
 if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
diff --git a/packages/zlib/test.bat b/packages/zlib/test.bat
index 76331e4..e4e436b 100644
--- a/packages/zlib/test.bat
+++ b/packages/zlib/test.bat
@@ -1,32 +1,5 @@
-REM Read Visual Studio install path
-for /f "tokens=* usebackq" %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere" -latest -property installationPath`) do (
-    set VSPATH=%%i
-)
-if not exist "%VSPATH%" (
-    echo Visual Studio cannot be loaded from %VSPATH%
-    exit /b 1
-)
-
-REM Check if vcvarsall.bat exists
-set "VCVARSALL=%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat"
-if not exist "%VCVARSALL%" (
-    echo vcvarsall.bat cannot be loaded from %VCVARSALL%
-    exit /b 1
-)
-echo Found vcvarsall.bat at %VCVARSALL% %PACKIT_OUTPUTS% >&3
-
-REM Retrieve architecture from target
-if "%PACKIT_TARGET%"=="x86_64-pc-windows-msvc" (
-    set ARCH=x64
-) else if "%PACKIT_TARGET%"=="aarch64-pc-windows-msvc" (
-    set ARCH=arm64
-) else (
-    echo Target %PACKIT_TARGET% is not supported for this package
-    exit /b 1
-)
-
-REM Call vcvarsall.bat to set MSVC build environment
-call "%VCVARSALL%" %ARCH% %PACKIT_OUTPUTS% >&3
+REM Call vcvarsall.bat to initialize MSVC build environment
+call "%PACKIT_VCVARSALL%" %PACKIT_VCVARSALL_ARCH% %PACKIT_OUTPUTS% >&3
 
 set TEST_TEXT = "Hello World! Duck, Mouse, Bird, Dog, Horse, idk, that's all the animals I know. I hope it's enough for this test code :)"
 echo "%TEST_TEXT%" > test.txt