mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-25 06:07:47 +08:00
Update provisioning script to build FFmpeg for Windows ARM64
Fixes: QTBUG-122745
Pick-to: 6.5
Change-Id: Ib03484ac89f07d7ad6433b0035769f4a9363495b
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit befe4a61d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
969309c09e
commit
58db36e43c
@@ -285,10 +285,10 @@ function GetVSPath {
|
||||
}
|
||||
|
||||
function EnterVSDevShell {
|
||||
# Add cl to path if it is not already there.
|
||||
if (Get-Command cl.exe -ErrorAction SilentlyContinue) {
|
||||
return $true
|
||||
}
|
||||
Param (
|
||||
[string]$HostArch = "amd64",
|
||||
[string]$Arch = "amd64"
|
||||
)
|
||||
|
||||
$vsWere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
|
||||
$vcComponent = "Microsoft.VisualStudio.Component.VC.CoreIde"
|
||||
@@ -296,10 +296,10 @@ function EnterVSDevShell {
|
||||
# If MSVC has an ABI break this will stop working, and yet another build must be added.
|
||||
$VSPath = (& $vsWere -nologo -products * -requires $vcComponent -sort -format value -property installationPath | Select-Object -Last 1)
|
||||
|
||||
Write-Host "Enter VisualStudio developer shell"
|
||||
Write-Host "Enter VisualStudio developer shell (-host_arch=$HostArch -arch=$Arch)"
|
||||
try {
|
||||
Import-Module "$VSPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
|
||||
Enter-VsDevShell -VsInstallPath $VSPath -DevCmdArguments "-arch=x64 -no_logo"
|
||||
Enter-VsDevShell -VsInstallPath $VSPath -DevCmdArguments "-host_arch=$HostArch -arch=$Arch -no_logo"
|
||||
} catch {
|
||||
Write-Host "Failed to enter VisualStudio DevShell"
|
||||
return $false
|
||||
|
||||
Reference in New Issue
Block a user