mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-22 12:56:45 +08:00
Provisioning: Add 64 bit Mingw to coin as packaging target
Change will provision DirectX SDK with enabler DotNetFramework also, so that configure for MinGW will detect ANGLE correctly. The DirectX headers and libs will be in two location, while those are installed with MSVC also. Task-number: QTBUG-35288 Change-Id: I04ca71a73b22cd4eb27987a368cd9ede03b0e437 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
@@ -0,0 +1,22 @@
|
||||
# The DirectX SDK installer requires .Net framework 3.5 which isn't installed
|
||||
# by default
|
||||
|
||||
$netFeature = "NetFx3"
|
||||
try {
|
||||
$netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State
|
||||
if ($netFeatureState -eq "Enabled") {
|
||||
Write-Host ".Net Framework is already installed"
|
||||
exit 0
|
||||
}
|
||||
} catch {
|
||||
Write-Host "Could not find .Net Framework Windows feature."
|
||||
exit 1
|
||||
}
|
||||
|
||||
Write-Host "Installing .Net Framework client"
|
||||
try {
|
||||
Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart
|
||||
} catch {
|
||||
Write-Host "Could not install .Net framework"
|
||||
exit 1
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
|
||||
|
||||
# This script will install 64-bit MinGW 7.3.0
|
||||
|
||||
$release = "x86_64-7.3.0-release-posix-seh-rt_v5-rev0"
|
||||
$sha1 = "0fce15036400568babd10d65b247e9576515da2c"
|
||||
|
||||
InstallMinGW $release $sha1
|
||||
|
||||
1
coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1
Normal file
1
coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1
Normal file
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\dxsdk.ps1"
|
||||
Reference in New Issue
Block a user