From df039e9236c5f0074eeb43ff58d8f0cd6bed9ac8 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 18 Mar 2022 13:51:50 -0700 Subject: [PATCH] Update build switches for latest SDL recommendations --- CMakeLists.txt | 19 ++++++++++++++++++- DDSView/DDSView_Desktop_2019.vcxproj | 12 ++++++------ DDSView/DDSView_Desktop_2022.vcxproj | 6 ++++++ DirectXTex/DirectXTex_Desktop_2019.vcxproj | 12 ++++++------ .../DirectXTex_Desktop_2019_Win10.vcxproj | 18 +++++++++--------- DirectXTex/DirectXTex_GDK_2017.vcxproj | 18 +++++++++--------- DirectXTex/DirectXTex_GDK_2019.vcxproj | 18 +++++++++--------- DirectXTex/DirectXTex_GDK_2022.vcxproj | 18 +++++++++--------- DirectXTex/DirectXTex_Windows10_2019.vcxproj | 16 ++++++++-------- Texassemble/Texassemble_Desktop_2019.vcxproj | 12 ++++++------ Texassemble/Texassemble_Desktop_2022.vcxproj | 6 ++++++ Texconv/Texconv_Desktop_2019.vcxproj | 12 ++++++------ Texconv/Texconv_Desktop_2022.vcxproj | 6 ++++++ Texdiag/texdiag_Desktop_2019.vcxproj | 12 ++++++------ Texdiag/texdiag_Desktop_2022.vcxproj | 6 ++++++ 15 files changed, 116 insertions(+), 75 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38f484f..200045b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -cmake_minimum_required (VERSION 3.11) +cmake_minimum_required (VERSION 3.13) set(DIRECTXTEX_VERSION 1.9.5) @@ -281,6 +281,15 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") endif() endif() + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24) + target_compile_options(${PROJECT_NAME} PRIVATE /ZH:SHA_256) + if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE)) + target_compile_options(texassemble PRIVATE /ZH:SHA_256) + target_compile_options(texconv PRIVATE /ZH:SHA_256) + target_compile_options(texdiag PRIVATE /ZH:SHA_256) + endif() + endif() + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26) target_compile_options(${PROJECT_NAME} PRIVATE /Zc:preprocessor /wd5105) if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE)) @@ -290,6 +299,14 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") endif() endif() + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) + if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE)) + target_link_options(texassemble PRIVATE /CETCOMPAT) + target_link_options(texconv PRIVATE /CETCOMPAT) + target_link_options(texdiag PRIVATE /CETCOMPAT) + endif() + endif() + if(BC_USE_OPENMP) target_compile_options(${PROJECT_NAME} PRIVATE /openmp /Zc:twoPhase-) if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE)) diff --git a/DDSView/DDSView_Desktop_2019.vcxproj b/DDSView/DDSView_Desktop_2019.vcxproj index cad99c2..cf26999 100644 --- a/DDSView/DDSView_Desktop_2019.vcxproj +++ b/DDSView/DDSView_Desktop_2019.vcxproj @@ -138,7 +138,7 @@ WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -161,7 +161,7 @@ WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -184,7 +184,7 @@ Guard true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -209,7 +209,7 @@ Guard true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -234,7 +234,7 @@ Guard true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -259,7 +259,7 @@ Guard true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 diff --git a/DDSView/DDSView_Desktop_2022.vcxproj b/DDSView/DDSView_Desktop_2022.vcxproj index 0264774..b6d1c1e 100644 --- a/DDSView/DDSView_Desktop_2022.vcxproj +++ b/DDSView/DDSView_Desktop_2022.vcxproj @@ -146,6 +146,7 @@ Windows true true + true false @@ -168,6 +169,7 @@ d3d11.lib;ole32.lib;windowscodecs.lib;uuid.lib;%(AdditionalDependencies) Windows true + true false @@ -194,6 +196,7 @@ true true true + true false @@ -218,6 +221,7 @@ Windows true true + true false @@ -244,6 +248,7 @@ true true true + true false @@ -268,6 +273,7 @@ Windows true true + true false diff --git a/DirectXTex/DirectXTex_Desktop_2019.vcxproj b/DirectXTex/DirectXTex_Desktop_2019.vcxproj index 816d1cf..948bd33 100644 --- a/DirectXTex/DirectXTex_Desktop_2019.vcxproj +++ b/DirectXTex/DirectXTex_Desktop_2019.vcxproj @@ -132,7 +132,7 @@ true Fast StreamingSIMDExtensions2 - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -159,7 +159,7 @@ MultiThreadedDebugDLL true Fast - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -186,7 +186,7 @@ true Fast StreamingSIMDExtensions2 - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -212,7 +212,7 @@ MaxSpeed true Fast - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -239,7 +239,7 @@ true Fast StreamingSIMDExtensions2 - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -265,7 +265,7 @@ MaxSpeed true Fast - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h diff --git a/DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj b/DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj index cc29896..8aeb691 100644 --- a/DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj +++ b/DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj @@ -187,7 +187,7 @@ true Fast StreamingSIMDExtensions2 - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -214,7 +214,7 @@ MultiThreadedDebugDLL true Fast - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -241,7 +241,7 @@ MultiThreadedDebugDLL true Fast - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -268,7 +268,7 @@ true Fast StreamingSIMDExtensions2 - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -294,7 +294,7 @@ MaxSpeed true Fast - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -320,7 +320,7 @@ MaxSpeed true Fast - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -347,7 +347,7 @@ true Fast StreamingSIMDExtensions2 - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -373,7 +373,7 @@ MaxSpeed true Fast - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h @@ -399,7 +399,7 @@ MaxSpeed true Fast - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) _UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN32_WINNT=0x0A00;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXTexP.h diff --git a/DirectXTex/DirectXTex_GDK_2017.vcxproj b/DirectXTex/DirectXTex_GDK_2017.vcxproj index 15ac0b5..c9dd656 100644 --- a/DirectXTex/DirectXTex_GDK_2017.vcxproj +++ b/DirectXTex/DirectXTex_GDK_2017.vcxproj @@ -247,7 +247,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) 6.0 @@ -272,7 +272,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) 6.0 @@ -297,7 +297,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) 6.0 @@ -322,7 +322,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) 6.0 @@ -347,7 +347,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) 6.0 @@ -372,7 +372,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) 6.0 @@ -394,7 +394,7 @@ _DEBUG;_LIB;%(PreprocessorDefinitions) true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) ProgramDatabase false @@ -418,7 +418,7 @@ _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) ProgramDatabase false @@ -442,7 +442,7 @@ _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) ProgramDatabase false diff --git a/DirectXTex/DirectXTex_GDK_2019.vcxproj b/DirectXTex/DirectXTex_GDK_2019.vcxproj index 79ee6f7..b50755a 100644 --- a/DirectXTex/DirectXTex_GDK_2019.vcxproj +++ b/DirectXTex/DirectXTex_GDK_2019.vcxproj @@ -247,7 +247,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Level4 @@ -273,7 +273,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Level4 @@ -299,7 +299,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Level4 @@ -325,7 +325,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Level4 @@ -351,7 +351,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Level4 @@ -377,7 +377,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Level4 @@ -400,7 +400,7 @@ _DEBUG;_LIB;%(PreprocessorDefinitions) true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Level4 ProgramDatabase false @@ -425,7 +425,7 @@ _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Level4 ProgramDatabase false @@ -450,7 +450,7 @@ _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Level4 ProgramDatabase false diff --git a/DirectXTex/DirectXTex_GDK_2022.vcxproj b/DirectXTex/DirectXTex_GDK_2022.vcxproj index d3db296..db1f8d6 100644 --- a/DirectXTex/DirectXTex_GDK_2022.vcxproj +++ b/DirectXTex/DirectXTex_GDK_2022.vcxproj @@ -247,7 +247,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) Level4 @@ -273,7 +273,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) Level4 @@ -299,7 +299,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) Level4 @@ -325,7 +325,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) Level4 @@ -351,7 +351,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) Level4 @@ -377,7 +377,7 @@ true true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) Level4 @@ -400,7 +400,7 @@ _DEBUG;_LIB;%(PreprocessorDefinitions) true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) Level4 ProgramDatabase false @@ -425,7 +425,7 @@ _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) Level4 ProgramDatabase false @@ -450,7 +450,7 @@ _DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions) true true - /Zc:twoPhase- %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) Level4 ProgramDatabase false diff --git a/DirectXTex/DirectXTex_Windows10_2019.vcxproj b/DirectXTex/DirectXTex_Windows10_2019.vcxproj index 04c37dc..8ba117f 100644 --- a/DirectXTex/DirectXTex_Windows10_2019.vcxproj +++ b/DirectXTex/DirectXTex_Windows10_2019.vcxproj @@ -236,7 +236,7 @@ $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) true ProgramDatabase false @@ -262,7 +262,7 @@ $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) true Level4 @@ -285,7 +285,7 @@ $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) true ProgramDatabase false @@ -311,7 +311,7 @@ $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) true ProgramDatabase false @@ -336,7 +336,7 @@ $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) true Level4 @@ -360,7 +360,7 @@ $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) true Level4 @@ -383,7 +383,7 @@ $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) true ProgramDatabase false @@ -408,7 +408,7 @@ $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) true Level4 diff --git a/Texassemble/Texassemble_Desktop_2019.vcxproj b/Texassemble/Texassemble_Desktop_2019.vcxproj index 4ac5bd2..c2ea625 100644 --- a/Texassemble/Texassemble_Desktop_2019.vcxproj +++ b/Texassemble/Texassemble_Desktop_2019.vcxproj @@ -138,7 +138,7 @@ WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -161,7 +161,7 @@ WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -184,7 +184,7 @@ Guard true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -209,7 +209,7 @@ Guard true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -233,7 +233,7 @@ WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Guard 26812 @@ -258,7 +258,7 @@ WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Guard 26812 diff --git a/Texassemble/Texassemble_Desktop_2022.vcxproj b/Texassemble/Texassemble_Desktop_2022.vcxproj index 1aee87e..4d463a0 100644 --- a/Texassemble/Texassemble_Desktop_2022.vcxproj +++ b/Texassemble/Texassemble_Desktop_2022.vcxproj @@ -146,6 +146,7 @@ Console true true + true false @@ -168,6 +169,7 @@ ole32.lib;windowscodecs.lib;uuid.lib;version.lib;%(AdditionalDependencies) Console true + true false @@ -194,6 +196,7 @@ true true true + true false @@ -218,6 +221,7 @@ Console true true + true false @@ -244,6 +248,7 @@ true true true + true false @@ -268,6 +273,7 @@ Console true true + true false diff --git a/Texconv/Texconv_Desktop_2019.vcxproj b/Texconv/Texconv_Desktop_2019.vcxproj index 0f223a4..6063c05 100644 --- a/Texconv/Texconv_Desktop_2019.vcxproj +++ b/Texconv/Texconv_Desktop_2019.vcxproj @@ -136,7 +136,7 @@ Fast StreamingSIMDExtensions2 ..\DirectXTex;%(AdditionalIncludeDirectories) - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true @@ -160,7 +160,7 @@ true Fast ..\DirectXTex;%(AdditionalIncludeDirectories) - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true @@ -183,7 +183,7 @@ Fast StreamingSIMDExtensions2 ..\DirectXTex;%(AdditionalIncludeDirectories) - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) Guard true @@ -209,7 +209,7 @@ true Fast ..\DirectXTex;%(AdditionalIncludeDirectories) - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) Guard true @@ -235,7 +235,7 @@ Fast StreamingSIMDExtensions2 ..\DirectXTex;%(AdditionalIncludeDirectories) - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true @@ -261,7 +261,7 @@ true Fast ..\DirectXTex;%(AdditionalIncludeDirectories) - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) + /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true diff --git a/Texconv/Texconv_Desktop_2022.vcxproj b/Texconv/Texconv_Desktop_2022.vcxproj index 91f0f73..0faf9e7 100644 --- a/Texconv/Texconv_Desktop_2022.vcxproj +++ b/Texconv/Texconv_Desktop_2022.vcxproj @@ -147,6 +147,7 @@ Console true true + true false @@ -170,6 +171,7 @@ ole32.lib;windowscodecs.lib;uuid.lib;version.lib;%(AdditionalDependencies) Console true + true false @@ -197,6 +199,7 @@ true true true + true false @@ -222,6 +225,7 @@ Console true true + true false @@ -249,6 +253,7 @@ true true true + true false @@ -274,6 +279,7 @@ Console true true + true false diff --git a/Texdiag/texdiag_Desktop_2019.vcxproj b/Texdiag/texdiag_Desktop_2019.vcxproj index 5fa487f..5bcb545 100644 --- a/Texdiag/texdiag_Desktop_2019.vcxproj +++ b/Texdiag/texdiag_Desktop_2019.vcxproj @@ -138,7 +138,7 @@ WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -161,7 +161,7 @@ WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -184,7 +184,7 @@ Guard true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -209,7 +209,7 @@ Guard true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -233,7 +233,7 @@ WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Guard 26812 @@ -258,7 +258,7 @@ WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true true - /Zc:__cplusplus %(AdditionalOptions) + /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) Guard 26812 diff --git a/Texdiag/texdiag_Desktop_2022.vcxproj b/Texdiag/texdiag_Desktop_2022.vcxproj index 0bd84ea..a618e16 100644 --- a/Texdiag/texdiag_Desktop_2022.vcxproj +++ b/Texdiag/texdiag_Desktop_2022.vcxproj @@ -146,6 +146,7 @@ Console true true + true false @@ -168,6 +169,7 @@ ole32.lib;windowscodecs.lib;uuid.lib;version.lib;%(AdditionalDependencies) Console true + true false @@ -194,6 +196,7 @@ true true true + true false @@ -218,6 +221,7 @@ Console true true + true false @@ -244,6 +248,7 @@ true true true + true false @@ -268,6 +273,7 @@ Console true true + true false