Commit 2a222c10 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

VS 2017 and Windows 10 Creators Update SDK (15063)

parent 7cb7fc90

Kits/DirectXTK/Audio/AudioEngine.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1550,7 +1550,10 @@ X3DAUDIO_HANDLE& AudioEngine::Get3DHandle() const 
#include <wrl.h>

#elif (_WIN32_WINNT >= _WIN32_WINNT_WIN8)

#pragma comment(lib,"runtimeobject.lib")

#pragma warning(push)

#pragma warning(disable: 4471)

#include <Windows.Devices.Enumeration.h>

#pragma warning(pop)

#include <wrl.h>

#endif

Kits/DirectXTK/DirectXTK_Windows10.vcxproj

+15 −11
Original line number Diff line number Diff line
@@ -418,40 +418,40 @@ 
    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>

    <AppContainerApplication>true</AppContainerApplication>

    <ApplicationType>Windows Store</ApplicationType>

    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>

    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>

    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v140</PlatformToolset>

    <PlatformToolset>v141</PlatformToolset>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

  <ImportGroup Label="ExtensionSettings">
@@ -525,6 +525,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -546,6 +547,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -566,6 +568,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -586,6 +589,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -606,6 +610,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -626,6 +631,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>Level4</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -640,8 +646,6 @@ 
  <ImportGroup Label="ExtensionTargets">

  </ImportGroup>

  <Target Name="ATGEnsureShaders" BeforeTargets="PrepareForBuild">

    <Exec Condition="!Exists('src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')"

        WorkingDirectory="$(ProjectDir)src/Shaders"

        Command="CompileShaders" />

    <Exec Condition="!Exists('src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)src/Shaders" Command="CompileShaders" />

  </Target>

</Project>
 
 No newline at end of file

Kits/DirectXTK/Readme.txt

+5 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11 


Copyright (c) Microsoft Corporation. All rights reserved.



February 10, 2017

April 7, 2017



This package contains the "DirectX Tool Kit", a collection of helper classes for 

writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10,
@@ -79,6 +79,10 @@ https://opensource.microsoft.com/codeofconduct/ 
RELEASE HISTORY

---------------



April 7, 2017

    VS 2017 updated for Windows Creators Update SDK (15063)

    XboxDDSTextureLoader updates



February 10, 2017

    GamePad now supports special value of -1 for 'most recently connected controller'

    WIC format 40bppCMYKAlpha should be converted to RGBA8 rather than RGBA16

Kits/DirectXTK/Src/pch.h

+3 −0
Original line number Diff line number Diff line
@@ -39,7 +39,10 @@ 
#endif



#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)

#pragma warning(push)

#pragma warning(disable: 4471)

#include <Windows.UI.Core.h>

#pragma warning(pop)

#endif



#include <DirectXMath.h>

Kits/DirectXTK12/Audio/AudioEngine.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1550,7 +1550,10 @@ X3DAUDIO_HANDLE& AudioEngine::Get3DHandle() const 
#include <wrl.h>

#elif (_WIN32_WINNT >= _WIN32_WINNT_WIN8)

#pragma comment(lib,"runtimeobject.lib")

#pragma warning(push)

#pragma warning(disable: 4471)

#include <Windows.Devices.Enumeration.h>

#pragma warning(pop)

#include <wrl.h>

#endif