From f87786b8f13ed40c048dcfca74a701eea2c2224d Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 1 Nov 2017 19:48:22 -0700 Subject: [PATCH] Update to use Windows 10 Fall Creators Update SDK (#63) * Updated for Windows 10 Fall Creators Update SDK (16299) --- DDSView/DDSView_Desktop_2017.vcxproj | 2 +- DirectXTex/DirectXTex_Desktop_2017.vcxproj | 2 +- DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj | 2 +- DirectXTex/DirectXTex_Windows10.vcxproj | 14 +++++++------- DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj | 3 +++ ReadMe.txt | 5 +++++ Texassemble/Texassemble_Desktop_2017.vcxproj | 2 +- Texconv/Texconv_Desktop_2017.vcxproj | 2 +- Texdiag/texdiag_Desktop_2017.vcxproj | 2 +- 9 files changed, 21 insertions(+), 13 deletions(-) diff --git a/DDSView/DDSView_Desktop_2017.vcxproj b/DDSView/DDSView_Desktop_2017.vcxproj index 41776c41..bff61a59 100644 --- a/DDSView/DDSView_Desktop_2017.vcxproj +++ b/DDSView/DDSView_Desktop_2017.vcxproj @@ -31,7 +31,7 @@ {9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84} DDSView Win32Proj - 10.0.15063.0 + 10.0.16299.0 diff --git a/DirectXTex/DirectXTex_Desktop_2017.vcxproj b/DirectXTex/DirectXTex_Desktop_2017.vcxproj index e4526197..a8670a3c 100644 --- a/DirectXTex/DirectXTex_Desktop_2017.vcxproj +++ b/DirectXTex/DirectXTex_Desktop_2017.vcxproj @@ -31,7 +31,7 @@ {371B9FA9-4C90-4AC6-A123-ACED756D6C77} DirectXTex Win32Proj - 10.0.15063.0 + 10.0.16299.0 diff --git a/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj b/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj index edaf6917..16bc7916 100644 --- a/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj +++ b/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj @@ -31,7 +31,7 @@ {371B9FA9-4C90-4AC6-A123-ACED756D6C77} DirectXTex Win32Proj - 10.0.14393.0 + 10.0.16299.0 diff --git a/DirectXTex/DirectXTex_Windows10.vcxproj b/DirectXTex/DirectXTex_Windows10.vcxproj index dfd4bfac..db6dd963 100644 --- a/DirectXTex/DirectXTex_Windows10.vcxproj +++ b/DirectXTex/DirectXTex_Windows10.vcxproj @@ -101,7 +101,7 @@ 14.0 true Windows Store - 10.0.15063.0 + 10.0.16299.0 10.0.14393.0 10.0 @@ -208,7 +208,7 @@ EnableAllWarnings DirectXTexP.h _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - /permissive- /Zc:twoPhase- %(AdditionalOptions) + /permissive- %(AdditionalOptions) Console @@ -227,7 +227,7 @@ EnableAllWarnings DirectXTexP.h _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - /permissive- /Zc:twoPhase- %(AdditionalOptions) + /permissive- %(AdditionalOptions) Console @@ -245,7 +245,7 @@ EnableAllWarnings DirectXTexP.h _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - /permissive- /Zc:twoPhase- %(AdditionalOptions) + /permissive- %(AdditionalOptions) Console @@ -263,7 +263,7 @@ EnableAllWarnings DirectXTexP.h _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - /permissive- /Zc:twoPhase- %(AdditionalOptions) + /permissive- %(AdditionalOptions) Console @@ -281,7 +281,7 @@ EnableAllWarnings DirectXTexP.h _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - /permissive- /Zc:twoPhase- %(AdditionalOptions) + /permissive- %(AdditionalOptions) Console @@ -299,7 +299,7 @@ EnableAllWarnings DirectXTexP.h _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - /permissive- /Zc:twoPhase- %(AdditionalOptions) + /permissive- %(AdditionalOptions) Console diff --git a/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj b/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj index 0a021d36..1dbc749a 100644 --- a/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj +++ b/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj @@ -177,6 +177,7 @@ true false $(IntDir)$(TargetName).pdb + /permissive- %(AdditionalOptions) @@ -201,6 +202,7 @@ true false $(IntDir)$(TargetName).pdb + /permissive- %(AdditionalOptions) @@ -220,6 +222,7 @@ _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) false $(IntDir)$(TargetName).pdb + /permissive- %(AdditionalOptions) diff --git a/ReadMe.txt b/ReadMe.txt index 14696f5d..de44384c 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -118,6 +118,11 @@ RELEASE NOTES * Loading of 96bpp floating-point TIFF files results in a corrupted image prior to Windows 8. This fix is available on Windows 7 SP1 with KB 2670838 installed. +* The VS 2017 projects make use of /permissive- for improved C++ standard conformance. Use of a Windows 10 SDK prior to + the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems + with the system headers. You can work around these by deleting /permissive- from the project files which is found + in the element. + ------------------------------------ RELEASE HISTORY diff --git a/Texassemble/Texassemble_Desktop_2017.vcxproj b/Texassemble/Texassemble_Desktop_2017.vcxproj index 461abd51..c1efdb2b 100644 --- a/Texassemble/Texassemble_Desktop_2017.vcxproj +++ b/Texassemble/Texassemble_Desktop_2017.vcxproj @@ -31,7 +31,7 @@ {8F18CBD7-4116-4956-BCD8-20D688A4CBD1} texassemble Win32Proj - 10.0.15063.0 + 10.0.16299.0 diff --git a/Texconv/Texconv_Desktop_2017.vcxproj b/Texconv/Texconv_Desktop_2017.vcxproj index a19ea199..adca899c 100644 --- a/Texconv/Texconv_Desktop_2017.vcxproj +++ b/Texconv/Texconv_Desktop_2017.vcxproj @@ -31,7 +31,7 @@ {C3A65381-8FD3-4F69-B29E-654B4B0ED136} texconv Win32Proj - 10.0.15063.0 + 10.0.16299.0 diff --git a/Texdiag/texdiag_Desktop_2017.vcxproj b/Texdiag/texdiag_Desktop_2017.vcxproj index dd813676..0476d4f8 100644 --- a/Texdiag/texdiag_Desktop_2017.vcxproj +++ b/Texdiag/texdiag_Desktop_2017.vcxproj @@ -31,7 +31,7 @@ {8E31A619-F4F8-413F-A973-4EE37B1AAA5D} texdiag Win32Proj - 10.0.15063.0 + 10.0.16299.0