Skip to content

Commit 5c1a256

Browse files
committed
Minor code review
1 parent 3e3ce5a commit 5c1a256

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

build/DirectXTex-GitHub-MinGW.yml

+14-8
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,13 @@ jobs:
121121
Write-Host "Added to path: $env:BUILD_SOURCESDIRECTORY\gw32\mingw32\bin"
122122
Write-Host "##vso[task.prependpath]$env:BUILD_SOURCESDIRECTORY\gw32\mingw32\bin"
123123
$sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10
124-
$windows11sdk = "{0}bin\$(WIN11_SDK)\" -f $sdkroot
125-
if (Test-Path "$windows11sdk") {
126-
Write-Host "##vso[task.setvariable variable=WindowsSdkVerBinPath;]$windows11sdk"
124+
$wsdkbin = "{0}bin\" -f $sdkroot
125+
$wsdkverbin = "{0}bin\$(WIN11_SDK)\" -f $sdkroot
126+
$wsdkarchbin = "{0}bin\$(WIN11_SDK)\x86" -f $sdkroot
127+
if (Test-Path "$wsdkarchbin") {
128+
Write-Host "##vso[task.setvariable variable=WindowsSdkBinPath;]$wsdkbin"
129+
Write-Host "##vso[task.setvariable variable=WindowsSdkVerBinPath;]$wsdkverbin"
130+
Write-Host "##vso[task.prependpath]$wsdkarchbin"
127131
}
128132
else {
129133
Write-Error -Message "##[error]Can't find Windows SDK ($(WIN11_SDK))" -ErrorAction Stop
@@ -242,11 +246,13 @@ jobs:
242246
script: |
243247
$ProgressPreference = 'SilentlyContinue'
244248
$sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10
245-
$windows11sdk = "{0}bin\$(WIN11_SDK)\" -f $sdkroot
246-
$windows11x64sdk = "{0}bin\$(WIN11_SDK)\x64" -f $sdkroot
247-
if (Test-Path "$windows11sdk") {
248-
Write-Host "##vso[task.setvariable variable=WindowsSdkVerBinPath;]$windows11sdk"
249-
Write-Host "##vso[task.prependpath]$windows11x64sdk"
249+
$wsdkbin = "{0}bin\" -f $sdkroot
250+
$wsdkverbin = "{0}bin\$(WIN11_SDK)\" -f $sdkroot
251+
$wsdkarchbin = "{0}bin\$(WIN11_SDK)\x64" -f $sdkroot
252+
if (Test-Path "$wsdkarchbin") {
253+
Write-Host "##vso[task.setvariable variable=WindowsSdkBinPath;]$wsdkbin"
254+
Write-Host "##vso[task.setvariable variable=WindowsSdkVerBinPath;]$wsdkverbin"
255+
Write-Host "##vso[task.prependpath]$wsdkarchbin"
250256
}
251257
else {
252258
Write-Error -Message "##[error]Can't find Windows SDK ($(WIN11_SDK))" -ErrorAction Stop

0 commit comments

Comments
 (0)