From 8467164fcef853bdd70f14f5252919ceffc33353 Mon Sep 17 00:00:00 2001
From: pal1000 <liviuprodea@yahoo.com>
Date: Thu, 19 Dec 2024 05:40:31 -0800
Subject: [PATCH] Windows SDK/WDK detection: ARM64 support

---
 buildscript/modules/dxil.cmd      | 1 -
 buildscript/modules/winsdkloc.cmd | 6 +++---
 releasenotes.md                   | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildscript/modules/dxil.cmd b/buildscript/modules/dxil.cmd
index 88afea18..af9a0848 100644
--- a/buildscript/modules/dxil.cmd
+++ b/buildscript/modules/dxil.cmd
@@ -1,7 +1,6 @@
 @setlocal ENABLEDELAYEDEXPANSION
 @set dxilloc=null
 @if EXIST "%devroot%\dxc\bin\%abi%\dxil.dll" set dxilloc="%devroot%\dxc\bin\%abi%\dxil.dll"
-@IF %abi%==arm64 if EXIST "%devroot%\dxc\bin\arm64\dxil.dll" set dxilloc="%devroot%\dxc\bin\arm64\dxil.dll"
 @IF %dxilloc%==null for /f delims^=^ eol^= %%a in ('@call "%devroot%\%projectname%\buildscript\modules\winsdkloc.cmd"') do @IF EXIST "%%a" for /f delims^=^ eol^= %%b in ('dir /b /s "%%a\bin\dxil.dll" 2^>^&1') do @if EXIST "%%b" (
 @set dxilwinsdk="%%~b"
 @IF "!dxilwinsdk:~-13,3!"=="%abi%" set dxilloc="%%~b"
diff --git a/buildscript/modules/winsdkloc.cmd b/buildscript/modules/winsdkloc.cmd
index cd00d9d6..aa260e1d 100644
--- a/buildscript/modules/winsdkloc.cmd
+++ b/buildscript/modules/winsdkloc.cmd
@@ -1,5 +1,5 @@
 @setlocal
 @set winsdk=null
-@IF /I NOT %PROCESSOR_ARCHITECTURE%==AMD64 IF EXIST "%ProgramFiles%\Windows Kits\10\Redist" set winsdk=%ProgramFiles%\Windows Kits\10
-@IF /I %PROCESSOR_ARCHITECTURE%==AMD64 IF EXIST "%ProgramFiles% (x86)\Windows Kits\10\Redist" set winsdk=%ProgramFiles% (x86)\Windows Kits\10
-@echo %winsdk%
+@IF EXIST "%ProgramFiles%\Windows Kits\10\Redist" set winsdk=%ProgramFiles%\Windows Kits\10
+@IF "%winsdk%"=="null" IF EXIST "%ProgramFiles% (x86)\Windows Kits\10\Redist" set winsdk=%ProgramFiles% (x86)\Windows Kits\10
+@echo %winsdk%
\ No newline at end of file
diff --git a/releasenotes.md b/releasenotes.md
index 76a9586c..06548911 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,6 +1,7 @@
 ### Build script
 - ARM64: Get MSVC build envvironment to initialize;
 - MSVC/MsBuild: Fix missing cases of ARM64 handling in solution setup;
+- Windows SDK/WDK detection: ARM64 support.
 - MSVC/MsBuild: Debug build support;
 - Retry build: Fix retry loop exit on successful build;
 - Retry build: Use it for dependencies build too.