From ec5cacaa8a1b1f173bad44b6551624a557df2818 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 27 Jul 2021 18:45:24 -0700 Subject: [PATCH] Added VS 2022 Preview projets for v143 Platform Toolset --- DirectXTK_Desktop_2022_Win10.sln | 84 ++++ DirectXTK_Desktop_2022_Win10.vcxproj | 446 +++++++++++++++++++ DirectXTK_Desktop_2022_Win10.vcxproj.filters | 357 +++++++++++++++ Inc/Audio.h | 5 + XWBTool/xwbtool_Desktop_2022.vcxproj | 244 ++++++++++ XWBTool/xwbtool_Desktop_2022.vcxproj.filters | 13 + 6 files changed, 1149 insertions(+) create mode 100644 DirectXTK_Desktop_2022_Win10.sln create mode 100644 DirectXTK_Desktop_2022_Win10.vcxproj create mode 100644 DirectXTK_Desktop_2022_Win10.vcxproj.filters create mode 100644 XWBTool/xwbtool_Desktop_2022.vcxproj create mode 100644 XWBTool/xwbtool_Desktop_2022.vcxproj.filters diff --git a/DirectXTK_Desktop_2022_Win10.sln b/DirectXTK_Desktop_2022_Win10.sln new file mode 100644 index 000000000..458266a04 --- /dev/null +++ b/DirectXTK_Desktop_2022_Win10.sln @@ -0,0 +1,84 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 16.0.29609.76 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2022_Win10", "DirectXTK_Desktop_2022_Win10.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeSpriteFont", "MakeSpriteFont\MakeSpriteFont.csproj", "{7329B02D-C504-482A-A156-181D48CE493C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XWBTool_Desktop_2022", "XWBTool\XWBTool_Desktop_2022.vcxproj", "{C7AB4186-54B2-4244-A533-77494763EA1D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BD5A62C9-FE7B-4491-82C2-BD46EA64D1C8}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|x86 = Debug|x86 + Debug|x64 = Debug|x64 + Release|ARM64 = Release|ARM64 + Release|Mixed Platforms = Release|Mixed Platforms + Release|x86 = Release|x86 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|ARM64.Build.0 = Debug|ARM64 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.ActiveCfg = Debug|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.ActiveCfg = Debug|x64 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.Build.0 = Debug|x64 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|ARM64.ActiveCfg = Release|ARM64 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|ARM64.Build.0 = Release|ARM64 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.Build.0 = Release|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64 + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|ARM64.Build.0 = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.ActiveCfg = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.ActiveCfg = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.Build.0 = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|ARM64.ActiveCfg = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|ARM64.Build.0 = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.ActiveCfg = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.Build.0 = Release|Any CPU + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|ARM64.Build.0 = Debug|ARM64 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.ActiveCfg = Debug|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.ActiveCfg = Debug|x64 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.Build.0 = Debug|x64 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|ARM64.ActiveCfg = Release|ARM64 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|ARM64.Build.0 = Release|ARM64 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.Build.0 = Release|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.ActiveCfg = Release|x64 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0F7A0290-0AF9-47AB-A91D-1346B9433995} + EndGlobalSection +EndGlobal diff --git a/DirectXTK_Desktop_2022_Win10.vcxproj b/DirectXTK_Desktop_2022_Win10.vcxproj new file mode 100644 index 000000000..03bb15939 --- /dev/null +++ b/DirectXTK_Desktop_2022_Win10.vcxproj @@ -0,0 +1,446 @@ + + + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + Document + + + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + Document + + + + + Document + + + + + Document + + + Document + + + + + Document + + + + + Document + + + + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E} + Win32Proj + DirectXTK + 10.0 + x64 + + + + StaticLibrary + true + v143 + Unicode + + + StaticLibrary + true + v143 + Unicode + + + StaticLibrary + true + v143 + Unicode + + + StaticLibrary + false + v143 + Unicode + + + StaticLibrary + false + v143 + Unicode + + + StaticLibrary + false + v143 + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + DirectXTK + + + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + DirectXTK + + + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + DirectXTK + + + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + DirectXTK + + + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + DirectXTK + + + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\ + DirectXTK + + + + Use + EnableAllWarnings + Disabled + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + $(IntDir)$(TargetName).pdb + true + true + /Zc:__cplusplus %(AdditionalOptions) + false + 4711;5045;26812 + Level4 + + + Windows + true + + + + + Use + EnableAllWarnings + Disabled + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + $(IntDir)$(TargetName).pdb + true + true + /Zc:__cplusplus %(AdditionalOptions) + false + 4711;5045;26812 + Level4 + + + Windows + true + + + + + Use + EnableAllWarnings + Disabled + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + StreamingSIMDExtensions2 + $(IntDir)$(TargetName).pdb + true + true + /Zc:__cplusplus %(AdditionalOptions) + false + 4711;5045;26812 + Level4 + + + Windows + true + + + + + EnableAllWarnings + Use + MaxSpeed + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + $(IntDir)$(TargetName).pdb + true + true + /Zc:__cplusplus %(AdditionalOptions) + 4711;5045;26812 + Level4 + + + Windows + true + true + true + + + + + EnableAllWarnings + Use + MaxSpeed + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + $(IntDir)$(TargetName).pdb + true + true + /Zc:__cplusplus %(AdditionalOptions) + 4711;5045;26812 + Level4 + + + Windows + true + true + true + + + + + EnableAllWarnings + Use + MaxSpeed + _WIN32_WINNT=0x0A00;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + pch.h + $(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories) + Fast + StreamingSIMDExtensions2 + $(IntDir)$(TargetName).pdb + true + true + /Zc:__cplusplus %(AdditionalOptions) + 4711;5045;26812 + Level4 + + + Windows + true + true + true + + + + + + + + <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) + <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) + <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ + + + + <_ATGFXCPath /> + + + + + <_ATGShaderHeaders Include="$(ProjectDir)src/Shaders/Compiled/*.inc" Exclude="$(ProjectDir)src/Shaders/Compiled/*Xbox*.inc" /> + <_ATGShaderSymbols Include="$(ProjectDir)src/Shaders/Compiled/*.pdb" Exclude="$(ProjectDir)src/Shaders/Compiled/*Xbox*.pdb" /> + + + + + \ No newline at end of file diff --git a/DirectXTK_Desktop_2022_Win10.vcxproj.filters b/DirectXTK_Desktop_2022_Win10.vcxproj.filters new file mode 100644 index 000000000..bcd441b46 --- /dev/null +++ b/DirectXTK_Desktop_2022_Win10.vcxproj.filters @@ -0,0 +1,357 @@ + + + + + {771f5f80-d173-49c3-8afb-790e8f7cb0ce} + + + {c52e19b6-8703-49a1-9b36-101a05b4745d} + + + {e07ba3bc-b69f-4ded-9ffa-3b47427e9fef} + + + {28e934ed-a6d7-4c30-b064-c72c50c99626} + + + {28d5fa16-99e2-471c-8cd8-2020e81f0024} + + + {34676173-31f5-4435-b90d-a0ad4f7d163c} + + + {5d47b946-09b9-4477-934f-ca45fba9845d} + + + + + Inc + + + Inc + + + Inc + + + Inc + + + Inc + + + Inc + + + Src + + + Src + + + Inc + + + Src + + + Inc + + + Inc + + + Inc + + + Inc + + + Inc + + + Inc + + + Audio + + + Audio + + + Audio + + + Audio + + + Inc\Shared + + + Inc\Shared + + + Inc\Shared + + + Inc\Shared + + + Inc\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Inc + + + Inc + + + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Src + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src\Shared + + + Src + + + Src + + + Src + + + Src + + + Src + + + Src + + + Audio + + + Src + + + Src + + + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders\Shared + + + Src\Shaders\Shared + + + Src\Shaders\Shared + + + Src\Shared + + + Src\Shaders + + + Src\Shaders + + + Src\Shaders\Shared + + + Src\Shaders + + + Src\Shaders\Shared + + + Src\Shaders + + + Src\Shaders\Shared + + + + \ No newline at end of file diff --git a/Inc/Audio.h b/Inc/Audio.h index 76e921eda..699a5b705 100644 --- a/Inc/Audio.h +++ b/Inc/Audio.h @@ -44,7 +44,12 @@ #include #include + +#pragma warning(push) +#pragma warning(disable : 4619 4616 5246) #include +#pragma warning(pop) + #include #ifndef USING_XAUDIO2_REDIST diff --git a/XWBTool/xwbtool_Desktop_2022.vcxproj b/XWBTool/xwbtool_Desktop_2022.vcxproj new file mode 100644 index 000000000..0f274a24d --- /dev/null +++ b/XWBTool/xwbtool_Desktop_2022.vcxproj @@ -0,0 +1,244 @@ + + + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {C7AB4186-54B2-4244-A533-77494763EA1D} + Win32Proj + XWBTool + 10.0 + + + + Application + true + v143 + Unicode + + + Application + true + v143 + Unicode + + + Application + true + v143 + Unicode + + + Application + false + v143 + Unicode + + + Application + false + v143 + Unicode + + + Application + false + v143 + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + XWBTool + + + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + XWBTool + + + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + XWBTool + + + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + XWBTool + + + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + XWBTool + + + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + Bin\Desktop_2022\$(Platform)\$(Configuration)\ + XWBTool + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + ..\Audio;..\Src;%(AdditionalIncludeDirectories) + true + false + 26812 + + + Console + true + true + kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + ..\Audio;..\Src;%(AdditionalIncludeDirectories) + true + false + 26812 + + + Console + true + kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + ..\Audio;..\Src;%(AdditionalIncludeDirectories) + true + false + 26812 + + + Console + true + kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) + + + + + Level4 + MaxSpeed + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + ..\Audio;..\Src;%(AdditionalIncludeDirectories) + Guard + true + false + 26812 + + + Console + true + true + true + true + kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) + + + + + Level4 + MaxSpeed + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + ..\Audio;..\Src;%(AdditionalIncludeDirectories) + Guard + true + false + 26812 + + + Console + true + true + true + kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) + + + + + Level4 + MaxSpeed + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + ..\Audio;..\Src;%(AdditionalIncludeDirectories) + Guard + true + false + 26812 + + + Console + true + true + true + kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/XWBTool/xwbtool_Desktop_2022.vcxproj.filters b/XWBTool/xwbtool_Desktop_2022.vcxproj.filters new file mode 100644 index 000000000..134c089a7 --- /dev/null +++ b/XWBTool/xwbtool_Desktop_2022.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file