From cfa63a8352a2d08463f9b9bb1075c6f50ba3f707 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 31 May 2018 13:27:33 -0700 Subject: [PATCH] Windows 10 April 2018 Update SDK (17134) (#102) --- DDSView/DDSView_Desktop_2017.vcxproj | 20 +++++++++----- DirectXTex/DirectXTex_Desktop_2017.vcxproj | 20 +++++++++----- .../DirectXTex_Desktop_2017_Win10.vcxproj | 21 ++++++++------ DirectXTex/DirectXTex_Windows10.vcxproj | 26 +++++++++++++----- .../Compiled/BC6HEncode_EncodeBlockCS.pdb | Bin 380416 -> 380416 bytes .../Compiled/BC6HEncode_TryModeG10CS.pdb | Bin 288256 -> 288256 bytes .../Compiled/BC6HEncode_TryModeLE10CS.pdb | Bin 298496 -> 298496 bytes .../Compiled/BC7Encode_EncodeBlockCS.pdb | Bin 226816 -> 226816 bytes .../Compiled/BC7Encode_TryMode02CS.pdb | Bin 187904 -> 187904 bytes .../Compiled/BC7Encode_TryMode137CS.pdb | Bin 187904 -> 187904 bytes .../Compiled/BC7Encode_TryMode456CS.pdb | Bin 183808 -> 183808 bytes ReadMe.txt | 4 +-- Texassemble/Texassemble_Desktop_2017.vcxproj | 20 +++++++++----- Texconv/Texconv_Desktop_2017.vcxproj | 20 +++++++++----- Texdiag/texdiag_Desktop_2017.vcxproj | 20 +++++++++----- 15 files changed, 99 insertions(+), 52 deletions(-) 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 e18da57935ce205a93b214507bf6ae38b335e857..fc8a6fccc9b9feb8281c9b5f6d9408a38ee26033 100644 GIT binary patch delta 252 zcmZpeBi=Aad;<%YM5yeqC`JYbhBe`0|3CPi@SAq}`CZ28&B>c(xKdc8kBKrf9O+?1o z%$_nbG%7POG%aRisQSvt@JWoJc{bnn*?f$-PdQ)i%v82mdzq1OqNDzHhcAqm7^ zR@-wiFfxGXcDZki+vUD7#hhW9U^Knv5VIN+1H<$s5W4-$A?EF84zaj><@)m+=nOE} zF0+GGi%AH=IkAS3L4koG0mPdgv5QrPg~6bfb$Z1vRwXPdwy)X68o`LuSKDRwus#t4 E0GAI;9RL6T diff --git a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.pdb b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.pdb index ff305f90c741f604929fbfb7175bf9d495855bcb..ce6359d2b986dfa68832931f76dabb3c4a54a03a 100644 GIT binary patch delta 222 zcmZoTBiL|8a03gMM1btCC`JYbh7i7$46R1neD(&1sOf23Jh54ZtAU08q#Pqd)MRD` zg=i9@uo+Fu*k4v eXht$muLxmL!lGjPnh=%dCC`JYb2L8XHe=@dAbX<74)qVTg=Jd@nTn#Mzf*DKB_i-C~=L~ob-#<(_(amDmA zF-&Sq3=HjGVwkpniD8!e%J~y$4Fki2=Rdbg2eD`~39+$)1?(9Z6c`v17#P@Cr$>aa h$gmvH`N=T7B7{W=i;C@QLRcagak_fDOc=`(egLZOK-~ZU diff --git a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.pdb b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.pdb index 29c7f25be58298c644cd28baa7ad7f6b82296a65..c68fabcc9ef1e09e8f92f8bda63862607d92d2ca 100644 GIT binary patch delta 206 zcmZpeBh)ZQXaftEM1btCC`JYbh7El8EX)?W`LEB?=00+wed=Zzt{E)S_x>|680}(a zVEV_%;MB{+u>Tq(gZ6hO2Cf)}=JR~p&+{=_K4pt?Zg9WzdOP12MiwR>9)@>LTnvm1 zAbPvpH%5nErU3rw3C&DuAi4uWw{K`>+PhJ5V%}5vMD+%ha$u5d;7xt3z%8 delta 211 zcmZpeBh)ZQXaftEgdFR{C`JYb2F~A0be<(o^IJXVhQZ5ot9Ngf;hMoBUHX)n!DtsV z1Jgf72HE=z4EwJ!GH8EiVwn1#srfwL_VavsC`JYbhU@j8W^f+3@3UU>k42f4Y|v&IE)N!IPc{YyzHbZ+ zT9=p@KD9A2XaU(DPBSxX+r`{m&$qpvkFismWAf`(w>z&dGfrnLWH#9DV8wWek%x!j zof8)WBLj%uE@#8|=Ofbr{^>G$Olm-SyNe#vI%XiF{fi;f_AiFa4JIrd+7=AkE7F*I O7;!pjyG#c26J7wAazI=F delta 187 zcmZp8!`twNcLNKTgbeG%C`JYbhR4$usyH@$^=lW2jjCDACbwCJ%Y#MQb_+8D-!}#Z ztxHS{jmk_6T0r)P)65K?#2A|E`L@^dF?MQmFlg_Vw^)0baXMomv%z);E5=KVJp2r+ z?YS5j89?-QIUB}5ADI{!rpxFtsR8NjE_zJsn1PJ;FNRFpzZfz%n6Nz17h>LCk;dG^ Oh|@{iWiptb@B#o?X*W9n diff --git a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.pdb b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.pdb index c099f33d9e656b41bc16be711fb10a3028482063..79c9fe2a9586d6df944e370cf534dab7026dd468 100644 GIT binary patch delta 241 zcmZqJ!`-lldjkuXgoo^}C`JYbh9w*`v@G>weHKnk_L^jUWWi<`t_T)s%g>Aqr;af( zyj#z}kX*;eaHNBY!R#p`1OHm)=6=5I{d|m-+HAhvbDZwH-p*&m$il?K!|=|Di-C~= zL~oa~VU&qtO5mSvGmTLVM5jRL_MT~s+k2)lwHZ$gU}JGCeJZ$J<`k0_lh8q+OBfg; x+!z=X7#I>57!EQ_k2u35!;+!7nPGax873txDz>jV!xX`Y(<9qu&M`gV2LSiHMqU5_ delta 244 zcmZqJ!`-lldjkuXgedF8C`JYb1_SB2Yxao?dv)=O1wUKWa(1%}R|JbRcMT)MsbfqG z@76OgG%7PO9O+jKV5m}<9&v_AhGl`iA?x&tGfYZYRBT^!hADy(r(d?qoMU>z4*=i}KQRCR diff --git a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.pdb b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.pdb index 7393c24c13da526c46fcdd8727fa005a78b0c7a3..814c4b5870742070f5bfd4a136127962f97f0fcc 100644 GIT binary patch delta 224 zcmZqJ!`-lldjkuXguCpoC`JYb1}FC5tL>+;PqTn;SKS^i86i~cb& zJUPzH@TrZFLEs!S!=uFv4BK`wH<$BmFXv;NsLk$h+Zyd!x+bOfPcHfEXH-rK*sb7a~aiubo-CFjN5EGiVI9iK;i8`;S5Hc?%pnQiRlS90B2TB AYybcN delta 221 zcmZqJ!`-lldjkuXgfQ#GC`JYbhRe%dTVGB(>bq$9y_}D6qBh4GkqRk`wU-&E8_r}j*zRD(c!`mR zpJBB<7Xu>$h+Zyd!x+cJz_49m7UMc*AY=N4xr}N+y8Xvo#_d1mGD#Us3}9n<#2~=1 vUFIB<786LxoC{1+(~~YR39%f|<7As&ae+w*WCTz+gAu2rx652&dcq9=5Vc3= diff --git a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.pdb b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.pdb index 5b5afbb489c9943ed7c88ea0f0f96e35d0f81cac..f4d52a406ae988b2e13c91acdf69352609723e76 100644 GIT binary patch delta 224 zcmZpe!`(24djkuXgq!TIC`JYbhEH=Hf6bqo;6M4m&GP2Woq3yOxI9?+@&ypo*uD>Nrpv2 e%Z6ck#U3UlEGo9I*~1jUh|}HMW%e;W;RgWby+QH- delta 224 zcmZpe!`(24djkuXgb?e*C`JYbhGOfLu4jMjb>Fz|V9k=>j}~o~;qqYNv)#hX!1s-T zLF*C|LriaT5#RPAKE`RyO^|?gwntQPs|w@6c`v17#Px6r$_8z il404PU&=bYVh@uN78Tpq>|u&v#OdzsGW(dG@B;u|lS0h^ 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