diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b6de30..cfa7da3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -284,8 +284,8 @@ if(WIN32) elseif(${DIRECTX_ARCH} MATCHES "^arm") set(WINVER 0x0602) else() - message(STATUS "Building with Windows 7 compatibility") - set(WINVER 0x0601) + message(STATUS "Building with Windows 8.1 compatibility") + set(WINVER 0x0603) endif() foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME}) diff --git a/CMakePresets.json b/CMakePresets.json index 2ddf75a..d724d7e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -118,7 +118,7 @@ }, { - "name": "Win7", + "name": "Win8", "cacheVariables": { "BUILD_DX12": false }, @@ -237,10 +237,10 @@ { "name": "arm64-Debug-UWP" , "description": "MSVC for ARM64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "MSVC", "UWP" ] }, { "name": "arm64-Release-UWP", "description": "MSVC for ARM64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "MSVC", "UWP" ] }, - { "name": "x64-Debug-Win7" , "description": "MSVC for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "MSVC", "Win7" ] }, - { "name": "x64-Release-Win7" , "description": "MSVC for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "MSVC", "Win7" ] }, - { "name": "x86-Debug-Win7" , "description": "MSVC for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "MSVC", "Win7" ] }, - { "name": "x86-Release-Win7" , "description": "MSVC for x86 (Release) for Windows 7", "inherits": [ "base", "x86", "Release", "MSVC", "Win7" ] }, + { "name": "x64-Debug-Win8" , "description": "MSVC for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "MSVC", "Win8" ] }, + { "name": "x64-Release-Win8" , "description": "MSVC for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "MSVC", "Win8" ] }, + { "name": "x86-Debug-Win8" , "description": "MSVC for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "MSVC", "Win8" ] }, + { "name": "x86-Release-Win8" , "description": "MSVC for x86 (Release) for Windows 7", "inherits": [ "base", "x86", "Release", "MSVC", "Win8" ] }, { "name": "x64-Debug-Scarlett" , "description": "MSVC for x64 (Debug) for Xbox Series X|S", "inherits": [ "base", "x64", "Debug", "MSVC", "Scarlett" ] }, { "name": "x64-Release-Scarlett" , "description": "MSVC for x64 (Release) for Xbox Series X|S", "inherits": [ "base", "x64", "Release", "MSVC", "Scarlett" ] }, @@ -278,10 +278,10 @@ { "name": "arm64-Debug-UWP-Clang" , "description": "Clang/LLVM for AArch64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "Clang", "Clang-AArch64", "UWP" ] }, { "name": "arm64-Release-UWP-Clang", "description": "Clang/LLVM for AArch64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "Clang", "Clang-AArch64", "UWP" ] }, - { "name": "x64-Debug-Win7-Clang" , "description": "Clang/LLVM for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "Clang", "Win7" ] }, - { "name": "x64-Release-Win7-Clang" , "description": "Clang/LLVM for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "Clang", "Win7" ] }, - { "name": "x86-Debug-Win7-Clang" , "description": "Clang/LLVM for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "Win7" ] }, - { "name": "x86-Release-Win7-Clang" , "description": "Clang/LLVM for x86 (Release) for Windows 7", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "Win7" ] }, + { "name": "x64-Debug-Win8-Clang" , "description": "Clang/LLVM for x64 (Debug) for Windows 7", "inherits": [ "base", "x64", "Debug", "Clang", "Win8" ] }, + { "name": "x64-Release-Win8-Clang" , "description": "Clang/LLVM for x64 (Release) for Windows 7", "inherits": [ "base", "x64", "Release", "Clang", "Win8" ] }, + { "name": "x86-Debug-Win8-Clang" , "description": "Clang/LLVM for x86 (Debug) for Windows 7", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "Win8" ] }, + { "name": "x86-Release-Win8-Clang" , "description": "Clang/LLVM for x86 (Release) for Windows 7", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "Win8" ] }, { "name": "x64-Debug-Scarlett-Clang" , "description": "Clang/LLVM for x64 (Debug) for Xbox Series X|S", "inherits": [ "base", "x64", "Debug", "Clang", "Scarlett" ] }, { "name": "x64-Release-Scarlett-Clang", "description": "Clang/LLVM for x64 (Release) for Xbox Series X|S", "inherits": [ "base", "x64", "Release", "Clang", "Scarlett" ] }, diff --git a/DirectXMesh/DirectXMesh_Desktop_2019.vcxproj b/DirectXMesh/DirectXMesh_Desktop_2019.vcxproj index ae328d5..e075750 100644 --- a/DirectXMesh/DirectXMesh_Desktop_2019.vcxproj +++ b/DirectXMesh/DirectXMesh_Desktop_2019.vcxproj @@ -138,7 +138,7 @@ Fast StreamingSIMDExtensions2 true - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -163,7 +163,7 @@ true Fast true - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -188,7 +188,7 @@ Fast StreamingSIMDExtensions2 true - WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -212,7 +212,7 @@ true Fast true - WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -238,7 +238,7 @@ Fast StreamingSIMDExtensions2 true - WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -262,7 +262,7 @@ true Fast true - WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb diff --git a/DirectXMesh/DirectXMesh_Desktop_2022.vcxproj b/DirectXMesh/DirectXMesh_Desktop_2022.vcxproj index baa9190..57e17c9 100644 --- a/DirectXMesh/DirectXMesh_Desktop_2022.vcxproj +++ b/DirectXMesh/DirectXMesh_Desktop_2022.vcxproj @@ -138,7 +138,7 @@ Fast StreamingSIMDExtensions2 true - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -163,7 +163,7 @@ true Fast true - WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -188,7 +188,7 @@ Fast StreamingSIMDExtensions2 true - WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -212,7 +212,7 @@ true Fast true - WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -238,7 +238,7 @@ Fast StreamingSIMDExtensions2 true - WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb @@ -262,7 +262,7 @@ true Fast true - WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0601;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;_WIN32_WINNT=0x0603;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) Use DirectXMeshP.h $(IntDir)$(TargetName).pdb diff --git a/Meshconvert/Meshconvert_Desktop_2019.vcxproj b/Meshconvert/Meshconvert_Desktop_2019.vcxproj index 6169f80..15c9267 100644 --- a/Meshconvert/Meshconvert_Desktop_2019.vcxproj +++ b/Meshconvert/Meshconvert_Desktop_2019.vcxproj @@ -136,7 +136,7 @@ StreamingSIMDExtensions2 ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) true /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -161,7 +161,7 @@ Fast ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) true /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) 26812 @@ -185,7 +185,7 @@ StreamingSIMDExtensions2 ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) Guard true /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) @@ -212,7 +212,7 @@ Fast ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) Guard true /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) @@ -239,7 +239,7 @@ StreamingSIMDExtensions2 ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) Guard true /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) @@ -266,7 +266,7 @@ Fast ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) Guard true /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) diff --git a/Meshconvert/Meshconvert_Desktop_2022.vcxproj b/Meshconvert/Meshconvert_Desktop_2022.vcxproj index b74fb1e..9569e5f 100644 --- a/Meshconvert/Meshconvert_Desktop_2022.vcxproj +++ b/Meshconvert/Meshconvert_Desktop_2022.vcxproj @@ -136,7 +136,7 @@ StreamingSIMDExtensions2 ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) true /Zc:__cplusplus %(AdditionalOptions) 26812 @@ -161,7 +161,7 @@ Fast ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) true /Zc:__cplusplus %(AdditionalOptions) 26812 @@ -185,7 +185,7 @@ StreamingSIMDExtensions2 ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) Guard true /Zc:__cplusplus %(AdditionalOptions) @@ -212,7 +212,7 @@ Fast ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) Guard true /Zc:__cplusplus %(AdditionalOptions) @@ -239,7 +239,7 @@ StreamingSIMDExtensions2 ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) Guard true /Zc:__cplusplus %(AdditionalOptions) @@ -266,7 +266,7 @@ Fast ..\DirectXMesh;..\Utilities;%(AdditionalIncludeDirectories) true - WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;PROFILE;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) Guard true /Zc:__cplusplus %(AdditionalOptions)