Merge remote-tracking branch 'origin/v3-feat/win' into v3-feat/win

This commit is contained in:
crazywhalecc 2025-12-11 14:47:31 +08:00
commit 8bf2f42596

View File

@ -181,11 +181,15 @@ trait windows
// Fix PHP VS version
// get vs version
$vc = WindowsUtil::findVisualStudio();
$vc_matches = match ($vc['major_version']) {
'17' => ['VS17', 'Visual C++ 2022'],
'16' => ['VS16', 'Visual C++ 2019'],
default => ['unknown', 'unknown'],
};
if ($vc === false) {
$vc_matches = ['unknown', 'unknown'];
} else {
$vc_matches = match ($vc['major_version']) {
'17' => ['VS17', 'Visual C++ 2022'],
'16' => ['VS16', 'Visual C++ 2019'],
default => ['unknown', 'unknown'],
};
}
// patch php-src/win32/build/confutils.js
FileSystem::replaceFileStr(
"{$package->getSourceDir()}\\win32\\build\\confutils.js",