瀏覽代碼

Update required SDK to 10.0.14393.0 (#111)

Marcelo Lopez Ruiz 8 年之前
父節點
當前提交
723438c9bf
共有 2 個文件被更改,包括 12 次插入13 次删除
  1. 2 2
      README.md
  2. 10 11
      utils/hct/hctstart.cmd

+ 2 - 2
README.md

@@ -1,4 +1,4 @@
-# DirectX Shader Compiler
+# DirectX Shader Compiler
 
 
 The DirectX Shader Compiler project includes a compiler and related tools used to compile High-Level Shader Language (HLSL) programs into DirectX Intermediate Language (DXIL) representation. Applications that make use of DirectX for graphics, games, and computation can use it to generate shader programs.
 The DirectX Shader Compiler project includes a compiler and related tools used to compile High-Level Shader Language (HLSL) programs into DirectX Intermediate Language (DXIL) representation. Applications that make use of DirectX for graphics, games, and computation can use it to generate shader programs.
 
 
@@ -26,7 +26,7 @@ Before you build, you will need to have some additional software installed.
 
 
 * [Git](http://git-scm.com/downloads).
 * [Git](http://git-scm.com/downloads).
 * [Visual Studio 2015](https://www.visualstudio.com/downloads), Update 3. This will install the Windows Development Kit. In the install options, make sure the following options are checked:
 * [Visual Studio 2015](https://www.visualstudio.com/downloads), Update 3. This will install the Windows Development Kit. In the install options, make sure the following options are checked:
-    * Windows 10 SDK (10.0.10240.0)
+    * Windows 10 SDK (version 14393)
     * Common Tools for Visual C++ 2015
     * Common Tools for Visual C++ 2015
 * [Windows 10 SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk). This is needed to build tests that reference the D3D12 runtime. You may get this as part of installing/updating Visual Studio.
 * [Windows 10 SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk). This is needed to build tests that reference the D3D12 runtime. You may get this as part of installing/updating Visual Studio.
 * [Windows Driver Kit](https://developer.microsoft.com/en-us/windows/hardware/windows-driver-kit). No need to download and install tests. This is used to build and run tests.
 * [Windows Driver Kit](https://developer.microsoft.com/en-us/windows/hardware/windows-driver-kit). No need to download and install tests. This is used to build and run tests.

+ 10 - 11
utils/hct/hctstart.cmd

@@ -178,21 +178,20 @@ if not exist "%kit_root%" (
   echo Windows 10 SDK was installed but is not accessible.
   echo Windows 10 SDK was installed but is not accessible.
   exit /b 1
   exit /b 1
 )
 )
-rem SDK version 10586 and 14393 will also work properly, but we use 10240 as
-rem canonical for now.
-if exist "%kit_root%\include\10.0.10586.0\um\d3d12.h" (
-  goto :eof
-)
+rem 10.0.14393.0 will work properly. Reject 10586 and 10240 explicitly.
 if exist "%kit_root%\include\10.0.14393.0\um\d3d12.h" (
 if exist "%kit_root%\include\10.0.14393.0\um\d3d12.h" (
+  echo Found Windows SDK 10.0.14393.0
   goto :eof
   goto :eof
 )
 )
-if not exist  "%kit_root%\include\10.0.10240.0\um\d3d12.h" (
-  echo Unable to find include files for Windows 10 SDK 10.0.10240.0.
-  echo   file "%kit_root%\include\10.0.10240.0\um\d3d12.h" does not exist
-  echo Please see the README.md instructions in the project root.
-  exit /b 1
+if exist "%kit_root%\include\10.0.10586.0\um\d3d12.h" (
+  echo Found Windows SDK 10.0.10586.0 - no longer supported.
 )
 )
-goto :eof
+if exist  "%kit_root%\include\10.0.10240.0\um\d3d12.h" (
+  echo Found Windows SDK 10.0.10240.0 - no longer supported.
+)
+echo Unable to find a suitable SDK version under %kit_root%\include
+echo Please see the README.md instructions in the project root.
+exit /b 1
 endlocal
 endlocal
 
 
 :checkcmake
 :checkcmake