diff --git a/DDSView/DDSView_Desktop_2017.vcxproj b/DDSView/DDSView_Desktop_2017.vcxproj
index 03245d0..35f9830 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.16299.0
+ 10.0.17134.0
@@ -151,10 +151,11 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
+ true
true
+ /Zc:__cplusplus %(AdditionalOptions)
d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -181,10 +182,11 @@
MultiThreadedDebugDLL
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
+ true
true
+ /Zc:__cplusplus %(AdditionalOptions)
d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -210,10 +212,11 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
+ true
true
+ /Zc:__cplusplus %(AdditionalOptions)
d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -241,10 +244,11 @@
MaxSpeed
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
+ true
true
+ /Zc:__cplusplus %(AdditionalOptions)
d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -272,10 +276,11 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
+ true
true
+ /Zc:__cplusplus %(AdditionalOptions)
d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -303,10 +308,11 @@
MaxSpeed
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;PROFILE;_WINDOWS;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
+ true
true
+ /Zc:__cplusplus %(AdditionalOptions)
d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
diff --git a/DirectXTex/DirectXTex_Desktop_2017.vcxproj b/DirectXTex/DirectXTex_Desktop_2017.vcxproj
index fde40b0..5c3c4c4 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.16299.0
+ 10.0.17134.0
@@ -129,12 +129,13 @@
true
Fast
StreamingSIMDExtensions2
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
Windows
@@ -159,12 +160,13 @@
MultiThreadedDebugDLL
true
Fast
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
Windows
@@ -189,12 +191,13 @@
true
Fast
StreamingSIMDExtensions2
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
true
@@ -220,12 +223,13 @@
MaxSpeed
true
Fast
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
true
@@ -252,12 +256,13 @@
true
Fast
StreamingSIMDExtensions2
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
true
@@ -283,12 +288,13 @@
MaxSpeed
true
Fast
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
true
diff --git a/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj b/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj
index b341a48..8ce62ca 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.16299.0
+ 10.0.17134.0
@@ -129,17 +129,17 @@
true
Fast
StreamingSIMDExtensions2
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
Windows
true
-
false
@@ -160,12 +160,13 @@
MultiThreadedDebugDLL
true
Fast
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
Windows
@@ -190,12 +191,13 @@
true
Fast
StreamingSIMDExtensions2
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
true
@@ -221,12 +223,13 @@
MaxSpeed
true
Fast
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
true
@@ -253,12 +256,13 @@
true
Fast
StreamingSIMDExtensions2
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
true
@@ -284,12 +288,13 @@
MaxSpeed
true
Fast
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
Use
DirectXTexP.h
$(IntDir)$(TargetName).pdb
true
+ true
true
diff --git a/DirectXTex/DirectXTex_Windows10.vcxproj b/DirectXTex/DirectXTex_Windows10.vcxproj
index b6a772d..19e5d88 100644
--- a/DirectXTex/DirectXTex_Windows10.vcxproj
+++ b/DirectXTex/DirectXTex_Windows10.vcxproj
@@ -101,7 +101,7 @@
14.0
true
Windows Store
- 10.0.16299.0
+ 10.0.17134.0
10.0.14393.0
10.0
@@ -209,7 +209,9 @@
EnableAllWarnings
DirectXTexP.h
_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
- /permissive- %(AdditionalOptions)
+ true
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
+ true
Console
@@ -229,7 +231,9 @@
EnableAllWarnings
DirectXTexP.h
_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
- /permissive- %(AdditionalOptions)
+ true
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
+ true
Console
@@ -248,7 +252,9 @@
EnableAllWarnings
DirectXTexP.h
_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
- /permissive- %(AdditionalOptions)
+ true
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
+ true
Console
@@ -267,7 +273,9 @@
EnableAllWarnings
DirectXTexP.h
_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
- /permissive- %(AdditionalOptions)
+ true
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
+ true
Console
@@ -286,7 +294,9 @@
EnableAllWarnings
DirectXTexP.h
_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
- /permissive- %(AdditionalOptions)
+ true
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
+ true
Console
@@ -305,7 +315,9 @@
EnableAllWarnings
DirectXTexP.h
_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)
- /permissive- %(AdditionalOptions)
+ true
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
+ true
Console
diff --git a/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS.pdb b/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS.pdb
index e18da57..fc8a6fc 100644
Binary files a/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS.pdb and b/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS.pdb differ
diff --git a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.pdb b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.pdb
index ff305f9..ce6359d 100644
Binary files a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.pdb and b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.pdb differ
diff --git a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.pdb b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.pdb
index 29c7f25..c68fabc 100644
Binary files a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.pdb and b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.pdb differ
diff --git a/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS.pdb b/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS.pdb
index 4755648..f4003ab 100644
Binary files a/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS.pdb and b/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS.pdb differ
diff --git a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.pdb b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.pdb
index c099f33..79c9fe2 100644
Binary files a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.pdb and b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.pdb differ
diff --git a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.pdb b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.pdb
index 7393c24..814c4b5 100644
Binary files a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.pdb and b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.pdb differ
diff --git a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.pdb b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.pdb
index 5b5afbb..f4d52a4 100644
Binary files a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.pdb and b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.pdb differ
diff --git a/ReadMe.txt b/ReadMe.txt
index 405efab..0c2d721 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -122,8 +122,8 @@ RELEASE NOTES
* 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.
+ with the system headers. You can work around these by disabling this switch in the project files which is found
+ in the or elements.
------------------------------------
diff --git a/Texassemble/Texassemble_Desktop_2017.vcxproj b/Texassemble/Texassemble_Desktop_2017.vcxproj
index 951ded2..ae0d04a 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.16299.0
+ 10.0.17134.0
@@ -151,9 +151,10 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
Guard
@@ -181,9 +182,10 @@
MultiThreadedDebugDLL
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
Guard
@@ -210,10 +212,11 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -241,10 +244,11 @@
MaxSpeed
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -272,9 +276,10 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
Guard
@@ -303,9 +308,10 @@
MaxSpeed
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
Guard
diff --git a/Texconv/Texconv_Desktop_2017.vcxproj b/Texconv/Texconv_Desktop_2017.vcxproj
index 0f773dc..c3168b8 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.16299.0
+ 10.0.17134.0
@@ -152,9 +152,10 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
Guard
@@ -183,9 +184,10 @@
true
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
Guard
@@ -213,10 +215,11 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
true
+ true
ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -245,10 +248,11 @@
true
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
true
+ true
ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -277,9 +281,10 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
Guard
@@ -309,9 +314,10 @@
true
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
+ /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions)
WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
Guard
diff --git a/Texdiag/texdiag_Desktop_2017.vcxproj b/Texdiag/texdiag_Desktop_2017.vcxproj
index fc80529..dcc209b 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.16299.0
+ 10.0.17134.0
@@ -151,9 +151,10 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
Guard
@@ -181,9 +182,10 @@
MultiThreadedDebugDLL
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
Guard
@@ -210,10 +212,11 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -241,10 +244,11 @@
MaxSpeed
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
Guard
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies)
@@ -272,9 +276,10 @@
Fast
StreamingSIMDExtensions2
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
Guard
@@ -303,9 +308,10 @@
MaxSpeed
Fast
..\DirectXTex;%(AdditionalIncludeDirectories)
- /permissive- /Zc:twoPhase- %(AdditionalOptions)
WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)
true
+ true
+ /Zc:__cplusplus %(AdditionalOptions)
Guard