Index: windows/build_tools/sdkenv.bat
===================================================================
--- windows/build_tools/sdkenv.bat	(revision 5a2cca46f7d8e5b0dde0150eb88d456592f5748d)
+++ windows/build_tools/sdkenv.bat	(revision daa0401d6cdbd685a0f135b66941e2e9276b9e18)
@@ -2,8 +2,10 @@
 SetLocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
 Set _sdkenv=
-For /D %%d In ("%ProgramFiles%\Microsoft Platform SDK*") Do (
-  Echo %%d
-  If Exist "%%d\SetEnv.cmd" (
-    Set _sdkenv=%%d\SetEnv.cmd
+For /F "tokens=*" %%S In ('dir /ad /b "%ProgramFiles%\Microsoft*SDK*"') Do (
+  For /F "tokens=*" %%B In ('dir /s /ad /b "%ProgramFiles%\%%S\*Bin"') Do (
+    If Exist "%%B\SetEnv.cmd" (
+      Echo %%B\SetEnv.cmd
+      Set _sdkenv=%%B\SetEnv.cmd
+    )
   )
 )
@@ -12,10 +14,10 @@
   For /D %%d In (%SystemRoot%) Do (
     If /I "%%~dd\WINDOWS"=="%SystemRoot%" (
-      Set plat=/XP32
+      Set plat=/x86
     ) Else (
       Set plat=/2000jym
     )
   )
-  call "%_sdkenv%" !plat! /RETAIL
+  call "%_sdkenv%" !plat! /RELEASE
   Set plat=
   SetLocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION