Skip to content

Commit a733a39

Browse files
authored
Windows 10 April 2018 Update SDK (17134) (#10)
1 parent d043a2b commit a733a39

File tree

409 files changed

+127
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+127
-144
lines changed

Kits/DirectXTK/DirectXTK_Desktop_2017.vcxproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@
493493
<ProjectGuid>{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}</ProjectGuid>
494494
<Keyword>Win32Proj</Keyword>
495495
<RootNamespace>DirectXTK</RootNamespace>
496-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
496+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
497497
</PropertyGroup>
498498
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
499499
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -567,7 +567,8 @@
567567
<FloatingPointModel>Fast</FloatingPointModel>
568568
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
569569
<SDLCheck>true</SDLCheck>
570-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
570+
<ConformanceMode>true</ConformanceMode>
571+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
571572
</ClCompile>
572573
<Link>
573574
<SubSystem>Windows</SubSystem>
@@ -586,7 +587,8 @@
586587
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
587588
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
588589
<SDLCheck>true</SDLCheck>
589-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
590+
<ConformanceMode>true</ConformanceMode>
591+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
590592
</ClCompile>
591593
<Link>
592594
<SubSystem>Windows</SubSystem>
@@ -604,7 +606,8 @@
604606
<FloatingPointModel>Fast</FloatingPointModel>
605607
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
606608
<SDLCheck>true</SDLCheck>
607-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
609+
<ConformanceMode>true</ConformanceMode>
610+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
608611
</ClCompile>
609612
<Link>
610613
<SubSystem>Windows</SubSystem>
@@ -625,7 +628,8 @@
625628
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
626629
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
627630
<SDLCheck>true</SDLCheck>
628-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
631+
<ConformanceMode>true</ConformanceMode>
632+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
629633
</ClCompile>
630634
<Link>
631635
<SubSystem>Windows</SubSystem>

Kits/DirectXTK/DirectXTK_Windows10.vcxproj

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@
523523
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
524524
<AppContainerApplication>true</AppContainerApplication>
525525
<ApplicationType>Windows Store</ApplicationType>
526-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
526+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
527527
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
528528
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
529529
</PropertyGroup>
@@ -631,7 +631,8 @@
631631
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
632632
<WarningLevel>EnableAllWarnings</WarningLevel>
633633
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
634-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
634+
<ConformanceMode>true</ConformanceMode>
635+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
635636
</ClCompile>
636637
<Link>
637638
<SubSystem>Console</SubSystem>
@@ -651,7 +652,8 @@
651652
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
652653
<WarningLevel>EnableAllWarnings</WarningLevel>
653654
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
654-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
655+
<ConformanceMode>true</ConformanceMode>
656+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
655657
</ClCompile>
656658
<Link>
657659
<SubSystem>Console</SubSystem>
@@ -670,7 +672,8 @@
670672
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
671673
<WarningLevel>EnableAllWarnings</WarningLevel>
672674
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
673-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
675+
<ConformanceMode>true</ConformanceMode>
676+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
674677
</ClCompile>
675678
<Link>
676679
<SubSystem>Console</SubSystem>
@@ -689,7 +692,8 @@
689692
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
690693
<WarningLevel>EnableAllWarnings</WarningLevel>
691694
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
692-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
695+
<ConformanceMode>true</ConformanceMode>
696+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
693697
</ClCompile>
694698
<Link>
695699
<SubSystem>Console</SubSystem>
@@ -708,7 +712,8 @@
708712
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
709713
<WarningLevel>EnableAllWarnings</WarningLevel>
710714
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
711-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
715+
<ConformanceMode>true</ConformanceMode>
716+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
712717
</ClCompile>
713718
<Link>
714719
<SubSystem>Console</SubSystem>
@@ -727,7 +732,8 @@
727732
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
728733
<WarningLevel>EnableAllWarnings</WarningLevel>
729734
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
730-
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
735+
<ConformanceMode>true</ConformanceMode>
736+
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
731737
</ClCompile>
732738
<Link>
733739
<SubSystem>Console</SubSystem>

Kits/DirectXTK/Readme.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11
44

55
Copyright (c) Microsoft Corporation. All rights reserved.
66

7-
May 14, 2018
7+
May 31, 2018
88

99
This package contains the "DirectX Tool Kit", a collection of helper classes for
1010
writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10,
@@ -14,8 +14,8 @@ Windows Vista Service Pack 2 Direct3D 11.0 applications.
1414

1515
This code is designed to build with Visual Studio 2015 Update 3 or Visual Studio 2017.
1616
It is recommended that you make use of VS 2015 Update 3, Windows Tools 1.4.1, and the
17-
Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.5 update) or later with the
18-
Windows 10 Fall Creators Update SDK (16299).
17+
Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.7 update) or later with the
18+
Windows 10 April 2018 Update SDK (17134).
1919

2020
These components are designed to work without requiring any content from the DirectX SDK. For details,
2121
see "Where is the DirectX SDK?" <http://msdn.microsoft.com/en-us/library/ee663275.aspx>.
@@ -84,14 +84,18 @@ RELEASE NOTES
8484

8585
* The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to
8686
the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems
87-
with the system headers. You can work around these by deleting /permissive- from the project files which is found
88-
in the <AdditionalOptions> element.
87+
with the system headers. You can work around these by disabling this switch in the project files which is found
88+
in the <ConformanceMode> or <AdditionalOptions> elements.
8989

9090

9191
---------------
9292
RELEASE HISTORY
9393
---------------
9494

95+
May 31, 2018
96+
VS 2017 updated for Windows 10 April 2018 Update SDK (17134)
97+
Regenerated shaders using Windows 10 April 2018 Update SDK (17134)
98+
9599
May 14, 2018
96100
Updated for VS 2017 15.7 update warnings
97101
Code and project cleanup
@@ -124,6 +128,7 @@ December 13, 2017
124128

125129
November 1, 2017
126130
VS 2017 updated for Windows 10 Fall Creators Update SDK (16299)
131+
Regenerated shaders using Windows 10 Fall Creators Update SDK (16299)
127132

128133
September 22, 2017
129134
Updated for VS 2017 15.3 update /permissive- changes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)