diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 86b0c860..d3867a93 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -38,7 +38,7 @@ jobs: uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0 - if: matrix.platform != 'ARM64' - name: Build + name: Build (Windows 8.1) working-directory: ${{ github.workspace }} run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}.sln @@ -46,23 +46,13 @@ jobs: working-directory: ${{ github.workspace }} run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}_Win10.sln - - if: matrix.platform != 'ARM64' - name: Restore NuGet packages - working-directory: ${{ github.workspace }} - run: nuget restore ./DirectXTK_Desktop_${{ matrix.vs }}_Win7.sln - - - if: matrix.platform != 'ARM64' - name: 'Build (Windows 7)' - working-directory: ${{ github.workspace }} - run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}_Win7.sln - - if: matrix.vs == '2022' name: 'Build (UWP)' working-directory: ${{ github.workspace }} run: msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Windows10_2022.sln - if: matrix.platform != 'ARM64' - name: 'Build (Spectre)' + name: 'Build (Windows 8.1 w/ Spectre)' working-directory: ${{ github.workspace }} run: msbuild /m /p:SpectreMitigation=Spectre /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} ./DirectXTK_Desktop_${{ matrix.vs }}.sln diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml index 06ab3499..668c7177 100644 --- a/.github/workflows/vcpkg.yml +++ b/.github/workflows/vcpkg.yml @@ -36,6 +36,12 @@ jobs: - os: windows-2022 build_type: x86-Debug-VCPKG arch: amd64_x86 + - os: windows-2022 + build_type: x64-Debug-Redist + arch: amd64 + - os: windows-2022 + build_type: x64-Release-Redist + arch: amd64 - os: windows-2022 build_type: arm64-Debug-VCPKG arch: amd64_arm64 @@ -102,7 +108,7 @@ jobs: - name: 'Configure CMake' working-directory: ${{ github.workspace }} run: > - cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=OFF -DBUILD_XAUDIO_WIN10=OFF -DBUILD_XAUDIO_WIN8=OFF -DBUILD_XAUDIO_WIN7=ON + cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=OFF -DBUILD_XAUDIO_WIN10=OFF -DBUILD_XAUDIO_WIN8=OFF -DBUILD_XAUDIO_REDIST=ON -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build" -DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}" diff --git a/.nuget/directxtk_desktop_2019.nuspec b/.nuget/directxtk_desktop_2019.nuspec index fcee41e6..7b87938c 100644 --- a/.nuget/directxtk_desktop_2019.nuspec +++ b/.nuget/directxtk_desktop_2019.nuspec @@ -32,7 +32,7 @@ VertexTypes - structures for commonly used vertex data formats WICTextureLoader - WIC-based image file texture loader Matches the October 28, 2024 release on GitHub. -DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to support Windows 7 or later. +DirectX Tool Kit for Audio in this package uses XAudio 2.8 to support Windows 8.1. http://go.microsoft.com/fwlink/?LinkId=248929 images\icon.jpg @@ -41,9 +41,6 @@ DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to s false © Microsoft Corporation. All rights reserved. DirectX DirectXTK native nativepackage - - - @@ -54,23 +51,15 @@ DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to s - - - - - - - - diff --git a/.nuget/directxtk_desktop_2019.targets b/.nuget/directxtk_desktop_2019.targets index 5e54baf7..86fff51e 100644 --- a/.nuget/directxtk_desktop_2019.targets +++ b/.nuget/directxtk_desktop_2019.targets @@ -21,13 +21,13 @@ $(directxtk-LibPath);%(AdditionalLibraryDirectories) - DirectXTK.lib;DirectXTKAudioWin7.lib;%(AdditionalDependencies) + DirectXTK.lib;%(AdditionalDependencies) - HAS_DIRECTXTK;%(PreprocessorDefinitions) + HAS_DIRECTXTK;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) $(MSBuildThisFileDirectory)..\..\include;%(AdditionalIncludeDirectories) diff --git a/.nuget/directxtk_desktop_win10.targets b/.nuget/directxtk_desktop_win10.targets index 9ebdbade..a9b6fcb5 100644 --- a/.nuget/directxtk_desktop_win10.targets +++ b/.nuget/directxtk_desktop_win10.targets @@ -27,7 +27,7 @@ - HAS_DIRECTXTK;%(PreprocessorDefinitions) + HAS_DIRECTXTK;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions) $(MSBuildThisFileDirectory)..\..\include;%(AdditionalIncludeDirectories) diff --git a/Audio/DirectXTKAudio_Desktop_2019_Win7.vcxproj b/Audio/DirectXTKAudio_Desktop_2019_Win7.vcxproj deleted file mode 100644 index 75fb1602..00000000 --- a/Audio/DirectXTKAudio_Desktop_2019_Win7.vcxproj +++ /dev/null @@ -1,216 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - {4F150A30-CECB-49D1-8283-6A3F57438CF5} - Win32Proj - DirectXTKAudioWin7 - 10.0 - - - - StaticLibrary - true - v142 - Unicode - false - - - StaticLibrary - true - v142 - Unicode - false - - - StaticLibrary - false - v142 - Unicode - - - StaticLibrary - false - v142 - Unicode - - - - - - - - - - - - - - - - - - - Bin\Desktop_2019_Win7\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win7\$(Platform)\$(Configuration)\ - DirectXTKAudioWin7 - - - Bin\Desktop_2019_Win7\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win7\$(Platform)\$(Configuration)\ - DirectXTKAudioWin7 - - - Bin\Desktop_2019_Win7\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win7\$(Platform)\$(Configuration)\ - DirectXTKAudioWin7 - - - Bin\Desktop_2019_Win7\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win7\$(Platform)\$(Configuration)\ - DirectXTKAudioWin7 - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0601;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - StreamingSIMDExtensions2 - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /Zc:twoPhase- /ZH:SHA_256 %(AdditionalOptions) - false - Level4 - ProgramDatabase - - - Windows - true - - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0601;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /Zc:twoPhase- /ZH:SHA_256 %(AdditionalOptions) - false - Level4 - ProgramDatabase - - - Windows - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0601;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - StreamingSIMDExtensions2 - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /Zc:twoPhase- /ZH:SHA_256 %(AdditionalOptions) - Level4 - - - Windows - true - true - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0601;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /Zc:twoPhase- /ZH:SHA_256 %(AdditionalOptions) - Level4 - true - - - Windows - true - true - true - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/Audio/DirectXTKAudio_Desktop_2019_Win7.vcxproj.filters b/Audio/DirectXTKAudio_Desktop_2019_Win7.vcxproj.filters deleted file mode 100644 index 788464de..00000000 --- a/Audio/DirectXTKAudio_Desktop_2019_Win7.vcxproj.filters +++ /dev/null @@ -1,59 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Inc - - - Inc - - - Inc - - - Inc - - - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - - - - \ No newline at end of file diff --git a/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj b/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj deleted file mode 100644 index 4b7e5493..00000000 --- a/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj +++ /dev/null @@ -1,206 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - {4F150A30-CECB-49D1-8283-6A3F57438CF5} - Win32Proj - DirectXTKAudio - 10.0 - - - - StaticLibrary - true - v142 - Unicode - false - - - StaticLibrary - true - v142 - Unicode - false - - - StaticLibrary - false - v142 - Unicode - - - StaticLibrary - false - v142 - Unicode - - - - - - - - - - - - - - - - - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - DirectXTKAudioWin8 - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - DirectXTKAudioWin8 - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - DirectXTKAudioWin8 - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - DirectXTKAudioWin8 - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0602;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - StreamingSIMDExtensions2 - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - false - Level4 - ProgramDatabase - - - Windows - true - - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0602;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - false - Level4 - ProgramDatabase - - - Windows - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0602;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - StreamingSIMDExtensions2 - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - - - Windows - true - true - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0602;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - true - - - Windows - true - true - true - - - - - - \ No newline at end of file diff --git a/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj.filters b/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj.filters deleted file mode 100644 index e42a5199..00000000 --- a/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Inc - - - Inc - - - Inc - - - Inc - - - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - \ No newline at end of file diff --git a/Audio/DirectXTKAudio_Desktop_2022_Win7.vcxproj b/Audio/DirectXTKAudio_Desktop_2022_Win7.vcxproj deleted file mode 100644 index cc50e924..00000000 --- a/Audio/DirectXTKAudio_Desktop_2022_Win7.vcxproj +++ /dev/null @@ -1,216 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - {4F150A30-CECB-49D1-8283-6A3F57438CF5} - Win32Proj - DirectXTKAudioWin7 - 10.0 - - - - StaticLibrary - true - v143 - Unicode - false - - - StaticLibrary - true - v143 - Unicode - false - - - StaticLibrary - false - v143 - Unicode - - - StaticLibrary - false - v143 - Unicode - - - - - - - - - - - - - - - - - - - Bin\Desktop_2022_Win7\$(Platform)\$(Configuration)\ - Bin\Desktop_2022_Win7\$(Platform)\$(Configuration)\ - DirectXTKAudioWin7 - - - Bin\Desktop_2022_Win7\$(Platform)\$(Configuration)\ - Bin\Desktop_2022_Win7\$(Platform)\$(Configuration)\ - DirectXTKAudioWin7 - - - Bin\Desktop_2022_Win7\$(Platform)\$(Configuration)\ - Bin\Desktop_2022_Win7\$(Platform)\$(Configuration)\ - DirectXTKAudioWin7 - - - Bin\Desktop_2022_Win7\$(Platform)\$(Configuration)\ - Bin\Desktop_2022_Win7\$(Platform)\$(Configuration)\ - DirectXTKAudioWin7 - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0601;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - StreamingSIMDExtensions2 - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /Zc:twoPhase- %(AdditionalOptions) - false - Level4 - ProgramDatabase - - - Windows - true - - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0601;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /Zc:twoPhase- %(AdditionalOptions) - false - Level4 - ProgramDatabase - - - Windows - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0601;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - StreamingSIMDExtensions2 - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /Zc:twoPhase- %(AdditionalOptions) - Level4 - - - Windows - true - true - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0601;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus /Zc:twoPhase- %(AdditionalOptions) - Level4 - true - - - Windows - true - true - true - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/Audio/DirectXTKAudio_Desktop_2022_Win7.vcxproj.filters b/Audio/DirectXTKAudio_Desktop_2022_Win7.vcxproj.filters deleted file mode 100644 index 788464de..00000000 --- a/Audio/DirectXTKAudio_Desktop_2022_Win7.vcxproj.filters +++ /dev/null @@ -1,59 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Inc - - - Inc - - - Inc - - - Inc - - - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - - - - \ No newline at end of file diff --git a/Audio/DirectXTKAudio_Desktop_2022_Win8.vcxproj b/Audio/DirectXTKAudio_Desktop_2022_Win8.vcxproj deleted file mode 100644 index a0ae7409..00000000 --- a/Audio/DirectXTKAudio_Desktop_2022_Win8.vcxproj +++ /dev/null @@ -1,206 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - {4F150A30-CECB-49D1-8283-6A3F57438CF5} - Win32Proj - DirectXTKAudio - 10.0 - - - - StaticLibrary - true - v143 - Unicode - false - - - StaticLibrary - true - v143 - Unicode - false - - - StaticLibrary - false - v143 - Unicode - - - StaticLibrary - false - v143 - Unicode - - - - - - - - - - - - - - - - - - - Bin\Desktop_2022\$(Platform)\$(Configuration)\ - Bin\Desktop_2022\$(Platform)\$(Configuration)\ - DirectXTKAudioWin8 - - - Bin\Desktop_2022\$(Platform)\$(Configuration)\ - Bin\Desktop_2022\$(Platform)\$(Configuration)\ - DirectXTKAudioWin8 - - - Bin\Desktop_2022\$(Platform)\$(Configuration)\ - Bin\Desktop_2022\$(Platform)\$(Configuration)\ - DirectXTKAudioWin8 - - - Bin\Desktop_2022\$(Platform)\$(Configuration)\ - Bin\Desktop_2022\$(Platform)\$(Configuration)\ - DirectXTKAudioWin8 - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0602;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - StreamingSIMDExtensions2 - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus %(AdditionalOptions) - false - Level4 - ProgramDatabase - - - Windows - true - - - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0602;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus %(AdditionalOptions) - false - Level4 - ProgramDatabase - - - Windows - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0602;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - StreamingSIMDExtensions2 - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus %(AdditionalOptions) - Level4 - - - Windows - true - true - true - - - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0602;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - ..\Inc;..\Src;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - pch.h - true - true - /Zc:__cplusplus %(AdditionalOptions) - Level4 - true - - - Windows - true - true - true - - - - - - \ No newline at end of file diff --git a/Audio/DirectXTKAudio_Desktop_2022_Win8.vcxproj.filters b/Audio/DirectXTKAudio_Desktop_2022_Win8.vcxproj.filters deleted file mode 100644 index e42a5199..00000000 --- a/Audio/DirectXTKAudio_Desktop_2022_Win8.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Inc - - - Inc - - - Inc - - - Inc - - - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - Src - - - \ No newline at end of file diff --git a/Audio/SoundStreamInstance.cpp b/Audio/SoundStreamInstance.cpp index 710fd686..74f64ccb 100644 --- a/Audio/SoundStreamInstance.cpp +++ b/Audio/SoundStreamInstance.cpp @@ -579,11 +579,7 @@ HRESULT SoundStreamInstance::Impl::PlayBuffers() noexcept if (mPackets[j].state == State::PENDING) { DWORD cb = 0; - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) const BOOL result = GetOverlappedResultEx(async, &mPackets[j].request, &cb, 0, FALSE); - #else - const BOOL result = GetOverlappedResult(async, &mPackets[j].request, &cb, FALSE); - #endif if (result) { mPackets[j].state = State::READY; diff --git a/Audio/WAVFileReader.cpp b/Audio/WAVFileReader.cpp index d6acd160..70e52b89 100644 --- a/Audio/WAVFileReader.cpp +++ b/Audio/WAVFileReader.cpp @@ -540,20 +540,10 @@ namespace return E_INVALIDARG; // open the file - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) ScopedHandle hFile(safe_handle(CreateFile2( szFileName, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr))); - #else - ScopedHandle hFile(safe_handle(CreateFileW( - szFileName, - GENERIC_READ, FILE_SHARE_READ, - nullptr, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, - nullptr))); - #endif - if (!hFile) { return HRESULT_FROM_WIN32(GetLastError()); diff --git a/Audio/WaveBankReader.cpp b/Audio/WaveBankReader.cpp index 0bb4a152..95d4c45e 100644 --- a/Audio/WaveBankReader.cpp +++ b/Audio/WaveBankReader.cpp @@ -526,7 +526,6 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false) return HRESULT_FROM_WIN32(GetLastError()); } -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) CREATEFILE2_EXTENDED_PARAMETERS params = { sizeof(CREATEFILE2_EXTENDED_PARAMETERS), 0, 0, 0, {}, nullptr }; params.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; params.dwFileFlags = FILE_FLAG_OVERLAPPED | FILE_FLAG_SEQUENTIAL_SCAN; @@ -534,15 +533,6 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false) szFileName, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, ¶ms))); -#else - ScopedHandle hFile(safe_handle(CreateFileW( - szFileName, - GENERIC_READ, FILE_SHARE_READ, - nullptr, - OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_SEQUENTIAL_SCAN, - nullptr))); -#endif - if (!hFile) { return HRESULT_FROM_WIN32(GetLastError()); @@ -552,29 +542,15 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false) OVERLAPPED request = {}; request.hEvent = m_event.get(); - bool wait = false; if (!ReadFile(hFile.get(), &m_header, sizeof(m_header), nullptr, &request)) { const DWORD error = GetLastError(); if (error != ERROR_IO_PENDING) return HRESULT_FROM_WIN32(error); - wait = true; } DWORD bytes; -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - std::ignore = wait; - BOOL result = GetOverlappedResultEx(hFile.get(), &request, &bytes, INFINITE, FALSE); -#else - if (wait) - { - std::ignore = WaitForSingleObject(m_event.get(), INFINITE); - } - - BOOL result = GetOverlappedResult(hFile.get(), &request, &bytes, FALSE); -#endif - if (!result || (bytes != sizeof(m_header))) { return HRESULT_FROM_WIN32(GetLastError()); @@ -602,26 +578,14 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false) request.Offset = m_header.Segments[HEADER::SEGIDX_BANKDATA].dwOffset; request.hEvent = m_event.get(); - wait = false; if (!ReadFile(hFile.get(), &m_data, sizeof(m_data), nullptr, &request)) { const DWORD error = GetLastError(); if (error != ERROR_IO_PENDING) return HRESULT_FROM_WIN32(error); - wait = true; } -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) result = GetOverlappedResultEx(hFile.get(), &request, &bytes, INFINITE, FALSE); -#else - if (wait) - { - std::ignore = WaitForSingleObject(m_event.get(), INFINITE); - } - - result = GetOverlappedResult(hFile.get(), &request, &bytes, FALSE); -#endif - if (!result || (bytes != sizeof(m_data))) { return HRESULT_FROM_WIN32(GetLastError()); @@ -688,26 +652,14 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false) request.Offset = m_header.Segments[HEADER::SEGIDX_ENTRYNAMES].dwOffset; request.hEvent = m_event.get(); - wait = false; if (!ReadFile(hFile.get(), temp.get(), namesBytes, nullptr, &request)) { const DWORD error = GetLastError(); if (error != ERROR_IO_PENDING) return HRESULT_FROM_WIN32(error); - wait = true; } - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) result = GetOverlappedResultEx(hFile.get(), &request, &bytes, INFINITE, FALSE); - #else - if (wait) - { - std::ignore = WaitForSingleObject(m_event.get(), INFINITE); - } - - result = GetOverlappedResult(hFile.get(), &request, &bytes, FALSE); - #endif - if (!result || (namesBytes != bytes)) { return HRESULT_FROM_WIN32(GetLastError()); @@ -741,26 +693,14 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false) request.Offset = m_header.Segments[HEADER::SEGIDX_ENTRYMETADATA].dwOffset; request.hEvent = m_event.get(); - wait = false; if (!ReadFile(hFile.get(), m_entries.get(), metadataBytes, nullptr, &request)) { const DWORD error = GetLastError(); if (error != ERROR_IO_PENDING) return HRESULT_FROM_WIN32(error); - wait = true; } -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) result = GetOverlappedResultEx(hFile.get(), &request, &bytes, INFINITE, FALSE); -#else - if (wait) - { - std::ignore = WaitForSingleObject(m_event.get(), INFINITE); - } - - result = GetOverlappedResult(hFile.get(), &request, &bytes, FALSE); -#endif - if (!result || (metadataBytes != bytes)) { return HRESULT_FROM_WIN32(GetLastError()); @@ -794,26 +734,14 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false) request.Offset = m_header.Segments[HEADER::SEGIDX_SEEKTABLES].dwOffset; request.hEvent = m_event.get(); - wait = false; if (!ReadFile(hFile.get(), m_seekData.get(), seekLen, nullptr, &request)) { const DWORD error = GetLastError(); if (error != ERROR_IO_PENDING) return HRESULT_FROM_WIN32(error); - wait = true; } - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) result = GetOverlappedResultEx(hFile.get(), &request, &bytes, INFINITE, FALSE); - #else - if (wait) - { - std::ignore = WaitForSingleObject(m_event.get(), INFINITE); - } - - result = GetOverlappedResult(hFile.get(), &request, &bytes, FALSE); - #endif - if (!result || (seekLen != bytes)) { return HRESULT_FROM_WIN32(GetLastError()); @@ -840,25 +768,13 @@ HRESULT WaveBankReader::Impl::Open(const wchar_t* szFileName) noexcept(false) // If streaming, reopen without buffering hFile.reset(); - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) CREATEFILE2_EXTENDED_PARAMETERS params2 = { sizeof(CREATEFILE2_EXTENDED_PARAMETERS), 0, 0, 0, {}, nullptr }; params2.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; params2.dwFileFlags = FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING; - m_async = CreateFile2(szFileName, - GENERIC_READ, - FILE_SHARE_READ, - OPEN_EXISTING, + m_async = CreateFile2( + szFileName, + GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, ¶ms2); - #else - m_async = CreateFileW(szFileName, - GENERIC_READ, - FILE_SHARE_READ, - nullptr, - OPEN_EXISTING, - FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, - nullptr); - #endif - if (m_async == INVALID_HANDLE_VALUE) { return HRESULT_FROM_WIN32(GetLastError()); @@ -942,13 +858,7 @@ void WaveBankReader::Impl::Close() noexcept if (m_request.hEvent) { DWORD bytes; - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) std::ignore = GetOverlappedResultEx(m_async, &m_request, &bytes, INFINITE, FALSE); - #else - std::ignore = WaitForSingleObject(m_request.hEvent, INFINITE); - - std::ignore = GetOverlappedResult(m_async, &m_request, &bytes, FALSE); - #endif } CloseHandle(m_async); @@ -1279,12 +1189,8 @@ bool WaveBankReader::Impl::UpdatePrepared() noexcept if (m_request.hEvent) { - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) DWORD bytes; const BOOL result = GetOverlappedResultEx(m_async, &m_request, &bytes, 0, FALSE); - #else - const bool result = HasOverlappedIoCompleted(&m_request); - #endif if (result) { m_prepared = true; diff --git a/Audio/packages.config b/Audio/packages.config deleted file mode 100644 index 84a212da..00000000 --- a/Audio/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c220ada..e2fbcda9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ option(BUILD_TOOLS "Build XWBTool" ON) option(BUILD_XAUDIO_WIN10 "Build for XAudio 2.9" OFF) option(BUILD_XAUDIO_WIN8 "Build for XAudio 2.8" ON) -option(BUILD_XAUDIO_WIN7 "Build for XAudio2Redist" OFF) +option(BUILD_XAUDIO_REDIST "Build for XAudio2Redist" OFF) option(BUILD_GAMEINPUT "Build for GameInput" OFF) option(BUILD_WGI "Build for Windows.Gaming.Input" OFF) @@ -182,12 +182,12 @@ if(MINGW) endif() if(${DIRECTX_ARCH} MATCHES "^arm") - set(BUILD_XAUDIO_WIN7 OFF) + set(BUILD_XAUDIO_REDIST OFF) endif() if(WINDOWS_STORE OR BUILD_XAUDIO_WIN10 OR BUILD_XAUDIO_WIN8 - OR BUILD_XAUDIO_WIN7) + OR BUILD_XAUDIO_REDIST) set(LIBRARY_HEADERS ${LIBRARY_HEADERS} Inc/Audio.h) @@ -265,7 +265,7 @@ target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) if(WINDOWS_STORE OR BUILD_XAUDIO_WIN10 OR BUILD_XAUDIO_WIN8 - OR BUILD_XAUDIO_WIN7) + OR BUILD_XAUDIO_REDIST) target_include_directories(${PROJECT_NAME} PRIVATE Audio) endif() @@ -281,9 +281,9 @@ if(directxmath_FOUND) target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectXMath) endif() -if(BUILD_XAUDIO_WIN7 +if(BUILD_XAUDIO_REDIST AND (NOT BUILD_XAUDIO_WIN10) AND (NOT BUILD_XAUDIO_WIN8) AND (NOT WINDOWS_STORE)) - message(STATUS "Using XAudio2Redist for DirectX Tool Kit for Audio on Windows 7.") + message(STATUS "Using XAudio2Redist for DirectX Tool Kit for Audio.") find_package(xaudio2redist CONFIG REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC Microsoft::XAudio2Redist) target_compile_definitions(${PROJECT_NAME} PUBLIC USING_XAUDIO2_REDIST) @@ -483,15 +483,11 @@ if(WIN32) message(STATUS "Building for Windows 10/Windows 11.") set(WINVER 0x0A00) elseif(BUILD_XAUDIO_WIN8) - message(STATUS "Using DirectX Tool Kit for Audio on XAudio 2.8 (Windows 8).") - set(WINVER 0x0602) - elseif(${DIRECTX_ARCH} MATCHES "^arm") - message(STATUS "Building for Windows 8.") - set(WINVER 0x0602) + message(STATUS "Using DirectX Tool Kit for Audio on XAudio 2.8 (Windows 8.1).") + set(WINVER 0x0603) else() - message(STATUS "Building for Windows 7.") - set(WINVER 0x0601) - target_compile_definitions(${PROJECT_NAME} PRIVATE _WIN7_PLATFORM_UPDATE) + message(STATUS "Building for Windows 8.1") + set(WINVER 0x0603) endif() foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME}) diff --git a/CMakePresets.json b/CMakePresets.json index d0dec1fd..a4e3d032 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -118,11 +118,11 @@ }, { - "name": "Win7", + "name": "XAudio2Redist", "cacheVariables": { "BUILD_XAUDIO_WIN10": false, "BUILD_XAUDIO_WIN8": false, - "BUILD_XAUDIO_WIN7": true, + "BUILD_XAUDIO_REDIST": true, "BUILD_XINPUT": true }, "hidden": true @@ -132,7 +132,7 @@ "cacheVariables": { "BUILD_XAUDIO_WIN10": true, "BUILD_XAUDIO_WIN8": false, - "BUILD_XAUDIO_WIN7": false, + "BUILD_XAUDIO_REDIST": false, "BUILD_WGI": true }, "hidden": true @@ -150,7 +150,7 @@ "cacheVariables": { "BUILD_XAUDIO_WIN10": true, "BUILD_XAUDIO_WIN8": false, - "BUILD_XAUDIO_WIN7": false, + "BUILD_XAUDIO_REDIST": false, "BUILD_GAMEINPUT": true }, "hidden": true @@ -267,10 +267,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 w/ XAudio2Redist", "inherits": [ "base", "x64", "Debug", "MSVC", "Win7", "VCPKG" ] }, - { "name": "x64-Release-Win7", "description": "MSVC for x64 (Release) for Windows 7 w/ XAudio2Redist", "inherits": [ "base", "x64", "Release", "MSVC", "Win7", "VCPKG" ] }, - { "name": "x86-Debug-Win7" , "description": "MSVC for x86 (Debug) for Windows 7 w/ XAudio2Redist", "inherits": [ "base", "x86", "Debug", "MSVC", "Win7", "VCPKG" ] }, - { "name": "x86-Release-Win7", "description": "MSVC for x86 (Release) for Windows 7 w/ XAudio2Redist", "inherits": [ "base", "x86", "Release", "MSVC", "Win7", "VCPKG" ] }, + { "name": "x64-Debug-Redist" , "description": "MSVC for x64 (Debug) with XAudio2Redist", "inherits": [ "base", "x64", "Debug", "MSVC", "XAudio2Redist", "VCPKG" ] }, + { "name": "x64-Release-Redist", "description": "MSVC for x64 (Release) with XAudio2Redist", "inherits": [ "base", "x64", "Release", "MSVC", "XAudio2Redist", "VCPKG" ] }, + { "name": "x86-Debug-Redist" , "description": "MSVC for x86 (Debug) with XAudio2Redist", "inherits": [ "base", "x86", "Debug", "MSVC", "XAudio2Redist", "VCPKG" ] }, + { "name": "x86-Release-Redist", "description": "MSVC for x86 (Release) with XAudio2Redist", "inherits": [ "base", "x86", "Release", "MSVC", "XAudio2Redist", "VCPKG" ] }, { "name": "x64-Debug-GDK" , "description": "MSVC for x64 (Debug) with Microsoft GDK", "inherits": [ "base", "x64", "Debug", "MSVC", "GDK" ] }, { "name": "x64-Release-GDK" , "description": "MSVC for x64 (Release) with Microsoft GDK", "inherits": [ "base", "x64", "Release", "MSVC", "GDK" ] }, @@ -308,10 +308,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 w/ XAudio2Redist", "inherits": [ "base", "x64", "Debug", "Clang", "Win7", "VCPKG" ] }, - { "name": "x64-Release-Win7-Clang", "description": "Clang/LLVM for x64 (Release) for Windows 7 w/ XAudio2Redist", "inherits": [ "base", "x64", "Release", "Clang", "Win7", "VCPKG" ] }, - { "name": "x86-Debug-Win7-Clang" , "description": "Clang/LLVM for x86 (Debug) for Windows 7 w/ XAudio2Redist", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "Win7", "VCPKG" ] }, - { "name": "x86-Release-Win7-Clang", "description": "Clang/LLVM for x86 (Release) for Windows 7 w/ XAudio2Redist", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "Win7", "VCPKG" ] }, + { "name": "x64-Debug-Redist-Clang" , "description": "Clang/LLVM for x64 (Debug) with XAudio2Redist", "inherits": [ "base", "x64", "Debug", "Clang", "XAudio2Redist", "VCPKG" ] }, + { "name": "x64-Release-Redist-Clang", "description": "Clang/LLVM for x64 (Release) with XAudio2Redist", "inherits": [ "base", "x64", "Release", "Clang", "XAudio2Redist", "VCPKG" ] }, + { "name": "x86-Debug-Redist-Clang" , "description": "Clang/LLVM for x86 (Debug) with XAudio2Redist", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "XAudio2Redist", "VCPKG" ] }, + { "name": "x86-Release-Redist-Clang", "description": "Clang/LLVM for x86 (Release) with XAudio2Redist", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "XAudio2Redist", "VCPKG" ] }, { "name": "x64-Debug-Clang-VCPKG" , "description": "Clang/LLVM for x64 (Debug) using VCPKG", "inherits": [ "base", "x64", "Debug", "Clang", "VCPKG" ] }, { "name": "x64-Release-Clang-VCPKG" , "description": "Clang/LLVM for x64 (Release) using VCPKG", "inherits": [ "base", "x64", "Release", "Clang", "VCPKG" ] }, @@ -321,10 +321,10 @@ { "name": "x64-Debug-GDK-Clang" , "description": "Clang/LLVM for x64 (Debug) with Microsoft GDK", "inherits": [ "base", "x64", "Debug", "Clang", "GDK" ] }, { "name": "x64-Release-GDK-Clang" , "description": "Clang/LLVM for x64 (Release) with Microsoft GDK", "inherits": [ "base", "x64", "Release", "Clang", "GDK" ] }, - { "name": "x64-Debug-MinGW" , "description": "MinG-W64 (Debug)", "inherits": [ "base", "x64", "Debug", "GNUC", "VCPKG", "MinGW64", "Win7" ] }, - { "name": "x64-Release-MinGW", "description": "MinG-W64 (Release)", "inherits": [ "base", "x64", "Release", "GNUC", "VCPKG", "MinGW64", "Win7" ] }, - { "name": "x86-Debug-MinGW" , "description": "MinG-W32 (Debug)", "inherits": [ "base", "x86", "Debug", "GNUC", "VCPKG", "MinGW32", "Win7" ] }, - { "name": "x86-Release-MinGW", "description": "MinG-W32 (Release)", "inherits": [ "base", "x86", "Release", "GNUC", "VCPKG", "MinGW32", "Win7" ] }, + { "name": "x64-Debug-MinGW" , "description": "MinG-W64 (Debug)", "inherits": [ "base", "x64", "Debug", "GNUC", "VCPKG", "MinGW64", "XAudio2Redist" ] }, + { "name": "x64-Release-MinGW", "description": "MinG-W64 (Release)", "inherits": [ "base", "x64", "Release", "GNUC", "VCPKG", "MinGW64", "XAudio2Redist" ] }, + { "name": "x86-Debug-MinGW" , "description": "MinG-W32 (Debug)", "inherits": [ "base", "x86", "Debug", "GNUC", "VCPKG", "MinGW32", "XAudio2Redist" ] }, + { "name": "x86-Release-MinGW", "description": "MinG-W32 (Release)", "inherits": [ "base", "x86", "Release", "GNUC", "VCPKG", "MinGW32", "XAudio2Redist" ] }, { "name": "x64-Debug-ICC" , "description": "Intel Classic Compiler (Debug) for Windows 8", "inherits": [ "base", "x64", "Debug", "Intel" ] }, { "name": "x64-Release-ICC" , "description": "Intel Classic Compiler (Release) for Windows 8", "inherits": [ "base", "x64", "Release", "Intel" ] }, @@ -349,10 +349,10 @@ { "name": "arm64ec-Debug" , "configurePreset": "arm64ec-Debug" }, { "name": "arm64ec-Release", "configurePreset": "arm64ec-Release" }, - { "name": "x64-Debug-Win7" , "configurePreset": "x64-Debug-Win7" }, - { "name": "x64-Release-Win7" , "configurePreset": "x64-Release-Win7" }, - { "name": "x86-Debug-Win7" , "configurePreset": "x86-Debug-Win7" }, - { "name": "x86-Release-Win7" , "configurePreset": "x86-Release-Win7" }, + { "name": "x64-Debug-Redist" , "configurePreset": "x64-Debug-Redist" }, + { "name": "x64-Release-Redist" , "configurePreset": "x64-Release-Redist" }, + { "name": "x86-Debug-Redist" , "configurePreset": "x86-Debug-Redist" }, + { "name": "x86-Release-Redist" , "configurePreset": "x86-Release-Redist" }, { "name": "x64-Debug-Clang" , "configurePreset": "x64-Debug-Clang" }, { "name": "x64-Release-Clang" , "configurePreset": "x64-Release-Clang" }, diff --git a/DirectXTK_Desktop_2019.sln b/DirectXTK_Desktop_2019.sln index 3f4f0bd2..9595cdc2 100644 --- a/DirectXTK_Desktop_2019.sln +++ b/DirectXTK_Desktop_2019.sln @@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2019", "D EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeSpriteFont", "MakeSpriteFont\MakeSpriteFont.csproj", "{7329B02D-C504-482A-A156-181D48CE493C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTKAudio_Desktop_2019_Win8", "Audio\DirectXTKAudio_Desktop_2019_Win8.vcxproj", "{4F150A30-CECB-49D1-8283-6A3F57438CF5}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XWBTool_Desktop_2019", "XWBTool\XWBTool_Desktop_2019.vcxproj", "{C7AB4186-54B2-4244-A533-77494763EA1D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0317D9F7-1BFB-4422-8B2F-670E7956F12D}" @@ -19,61 +17,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {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}.Debug|x86.ActiveCfg = Debug|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32 {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 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32 {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}.Debug|x86.ActiveCfg = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|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 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x86.ActiveCfg = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x86.Build.0 = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x64.ActiveCfg = Debug|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x64.Build.0 = Debug|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|Mixed Platforms.Build.0 = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x86.ActiveCfg = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x86.Build.0 = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x64.ActiveCfg = Release|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x64.Build.0 = Release|x64 + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU {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}.Debug|x86.ActiveCfg = Debug|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32 {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 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DirectXTK_Desktop_2019.vcxproj b/DirectXTK_Desktop_2019.vcxproj index 5fcac919..cbf450db 100644 --- a/DirectXTK_Desktop_2019.vcxproj +++ b/DirectXTK_Desktop_2019.vcxproj @@ -19,6 +19,10 @@ + + + + @@ -55,6 +59,15 @@ + + + + + + + + + @@ -240,7 +253,7 @@ Use EnableAllWarnings Disabled - _WIN32_WINNT=0x0601;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0603;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) pch.h $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) Fast @@ -262,7 +275,7 @@ Use EnableAllWarnings Disabled - _WIN32_WINNT=0x0601;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0603;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) pch.h $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) Fast @@ -285,7 +298,7 @@ EnableAllWarnings Use MaxSpeed - _WIN32_WINNT=0x0601;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0603;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) pch.h $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) Fast @@ -308,7 +321,7 @@ EnableAllWarnings Use MaxSpeed - _WIN32_WINNT=0x0601;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0603;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) pch.h $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) Fast diff --git a/DirectXTK_Desktop_2019.vcxproj.filters b/DirectXTK_Desktop_2019.vcxproj.filters index 0c8732b1..ce325aab 100644 --- a/DirectXTK_Desktop_2019.vcxproj.filters +++ b/DirectXTK_Desktop_2019.vcxproj.filters @@ -19,6 +19,9 @@ {34676173-31f5-4435-b90d-a0ad4f7d163c} + + {76f588c5-2d94-47db-ad9a-e9b00d5ba8d8} + @@ -123,6 +126,18 @@ Src\Shared + + Audio + + + Audio + + + Audio + + + Audio + @@ -242,6 +257,33 @@ Src + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + diff --git a/DirectXTK_Desktop_2019_Win7.sln b/DirectXTK_Desktop_2019_Win7.sln deleted file mode 100644 index 4f3bfeda..00000000 --- a/DirectXTK_Desktop_2019_Win7.sln +++ /dev/null @@ -1,78 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31507.150 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2019", "DirectXTK_Desktop_2019.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTKAudio_Desktop_2019_Win7", "Audio\DirectXTKAudio_Desktop_2019_Win7.vcxproj", "{4F150A30-CECB-49D1-8283-6A3F57438CF5}" -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_2019", "XWBTool\xwbtool_Desktop_2019.vcxproj", "{C7AB4186-54B2-4244-A533-77494763EA1D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{71F16217-C381-4317-9EC0-8B5EE77ED330}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Any CPU.ActiveCfg = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x64.ActiveCfg = Debug|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x64.Build.0 = Debug|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x86.ActiveCfg = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x86.Build.0 = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|Any CPU.ActiveCfg = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x64.ActiveCfg = Release|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x64.Build.0 = Release|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x86.ActiveCfg = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x86.Build.0 = Release|Win32 - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Any CPU.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}.Debug|x86.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|Any CPU.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 - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Any CPU.ActiveCfg = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.ActiveCfg = Release|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.Build.0 = Release|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3B774DEE-1D2A-4EEF-B8FA-75BDC1DA64DE} - EndGlobalSection -EndGlobal diff --git a/DirectXTK_Desktop_2022.sln b/DirectXTK_Desktop_2022.sln index 33f7bb9f..0f2d8386 100644 --- a/DirectXTK_Desktop_2022.sln +++ b/DirectXTK_Desktop_2022.sln @@ -1,14 +1,11 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 15.0.27703.2000 +VisualStudioVersion = 17.12.35514.174 d17.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2022", "DirectXTK_Desktop_2022.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}") = "DirectXTKAudio_Desktop_2022_Win8", "Audio\DirectXTKAudio_Desktop_2022_Win8.vcxproj", "{4F150A30-CECB-49D1-8283-6A3F57438CF5}" -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", "{0317D9F7-1BFB-4422-8B2F-670E7956F12D}" @@ -19,61 +16,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {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}.Debug|x86.ActiveCfg = Debug|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32 {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 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32 {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}.Debug|x86.ActiveCfg = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|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 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x86.ActiveCfg = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x86.Build.0 = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x64.ActiveCfg = Debug|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x64.Build.0 = Debug|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|Mixed Platforms.Build.0 = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x86.ActiveCfg = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x86.Build.0 = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x64.ActiveCfg = Release|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x64.Build.0 = Release|x64 + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU {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}.Debug|x86.ActiveCfg = Debug|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32 {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 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DirectXTK_Desktop_2022.vcxproj b/DirectXTK_Desktop_2022.vcxproj index d1bc9c74..554bfb5e 100644 --- a/DirectXTK_Desktop_2022.vcxproj +++ b/DirectXTK_Desktop_2022.vcxproj @@ -19,6 +19,10 @@ + + + + @@ -55,6 +59,15 @@ + + + + + + + + + @@ -240,7 +253,7 @@ Use EnableAllWarnings Disabled - _WIN32_WINNT=0x0601;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0603;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) pch.h $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) Fast @@ -262,7 +275,7 @@ Use EnableAllWarnings Disabled - _WIN32_WINNT=0x0601;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0603;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) pch.h $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) Fast @@ -285,7 +298,7 @@ EnableAllWarnings Use MaxSpeed - _WIN32_WINNT=0x0601;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0603;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) pch.h $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) Fast @@ -308,7 +321,7 @@ EnableAllWarnings Use MaxSpeed - _WIN32_WINNT=0x0601;_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0603;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) pch.h $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) Fast diff --git a/DirectXTK_Desktop_2022.vcxproj.filters b/DirectXTK_Desktop_2022.vcxproj.filters index 0c8732b1..6f61bad4 100644 --- a/DirectXTK_Desktop_2022.vcxproj.filters +++ b/DirectXTK_Desktop_2022.vcxproj.filters @@ -19,6 +19,9 @@ {34676173-31f5-4435-b90d-a0ad4f7d163c} + + {b40ce7c8-ada2-4f58-8824-5241fb4edb70} + @@ -123,6 +126,18 @@ Src\Shared + + Audio + + + Audio + + + Audio + + + Audio + @@ -242,6 +257,33 @@ Src + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + + + Audio + diff --git a/DirectXTK_Desktop_2022_Win7.sln b/DirectXTK_Desktop_2022_Win7.sln deleted file mode 100644 index 62a24aff..00000000 --- a/DirectXTK_Desktop_2022_Win7.sln +++ /dev/null @@ -1,78 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 16.0.31507.150 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2022", "DirectXTK_Desktop_2022.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTKAudio_Desktop_2022_Win7", "Audio\DirectXTKAudio_Desktop_2022_Win7.vcxproj", "{4F150A30-CECB-49D1-8283-6A3F57438CF5}" -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", "{71F16217-C381-4317-9EC0-8B5EE77ED330}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Any CPU.ActiveCfg = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x64.ActiveCfg = Debug|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x64.Build.0 = Debug|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x86.ActiveCfg = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Debug|x86.Build.0 = Debug|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|Any CPU.ActiveCfg = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x64.ActiveCfg = Release|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x64.Build.0 = Release|x64 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x86.ActiveCfg = Release|Win32 - {4F150A30-CECB-49D1-8283-6A3F57438CF5}.Release|x86.Build.0 = Release|Win32 - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Any CPU.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}.Debug|x86.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|Any CPU.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 - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Any CPU.ActiveCfg = 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}.Debug|x86.ActiveCfg = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Any CPU.ActiveCfg = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.ActiveCfg = Release|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.Build.0 = Release|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3B774DEE-1D2A-4EEF-B8FA-75BDC1DA64DE} - EndGlobalSection -EndGlobal diff --git a/Inc/Audio.h b/Inc/Audio.h index cf21fa51..d09f1235 100644 --- a/Inc/Audio.h +++ b/Inc/Audio.h @@ -36,10 +36,8 @@ #if defined(USING_XAUDIO2_REDIST) || (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/) || defined(_XBOX_ONE) #define USING_XAUDIO2_9 -#elif (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/) +#elif (_WIN32_WINNT >= 0x0603 /*_WIN32_WINNT_WINBLUE*/) #define USING_XAUDIO2_8 -#elif (_WIN32_WINNT >= 0x0601 /*_WIN32_WINNT_WIN7*/) -#error Windows 7 SP1 requires the XAudio2Redist NuGet package https://aka.ms/xaudio2redist #else #error DirectX Tool Kit for Audio not supported on this platform #endif diff --git a/Inc/GamePad.h b/Inc/GamePad.h index 24a8770b..8d3158f8 100644 --- a/Inc/GamePad.h +++ b/Inc/GamePad.h @@ -43,11 +43,7 @@ #elif defined(USING_XINPUT) #ifdef _MSC_VER -#if (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/ ) #pragma comment(lib,"xinput.lib") -#else -#pragma comment(lib,"xinput9_1_0.lib") -#endif #endif #endif diff --git a/README.md b/README.md index 28c00c63..8a794927 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,14 @@ FOR SECURITY ADVISORIES, see [GitHub](https://github.com/microsoft/DirectXTK/sec For a full change history, see [CHANGELOG.md](https://github.com/microsoft/DirectXTK/blob/main/CHANGELOG.md). +* Starting with the December 2024 release, Windows 7 and Windows 8.0 support has been retired. For *DirectX ToolKit for Audio* this means that `DirectXTKAudio_Desktop_*_Win7` has been removed, and `DirectXTKAudio_Desktop_*_Win8` has been integrated into the `DirectXTK_Desktop_*` vcxproj which uses XAudio 2.8 for Windows 8.1 compatibility. + + * Remove any References to or use of `DirectXTKAudio_Desktop_*_Win8.vcxproj` or `DirectXTKAudio_Desktop_*_Win7`. If using `DirectXTK_Desktop_*.vcxproj` you will be using XAudio 2.8 as before. Client code will need to build with `_WIN32_WINNT=0x0603`. + + * With the `directxtk_desktop_2019` NuGet package, you will be using XAudio 2.8 and no longer use the XAudio2Redist NuGet package. Client code will build with `_WIN32_WINNT=0x0603`. + + * If you want to use XAudio2Redist with Windows 8.1, the CMake project supports this with the build option `BUILD_XAUDIO_REDIST`. The CMake build option `BUILD_XAUDIO_WIN7` was renamed. + * Starting with the February 2023 release, the Mouse class implementation of relative mouse movement was updated to accumulate changes between calls to ``GetState``. By default, each time you call ``GetState`` the deltas are reset which works for scenarios where you use relative movement but only call the method once per frame. If you call it more than once per frame, then add an explicit call to ``EndOfInputFrame`` to use an explicit reset model instead. * As of the September 2022 release, the library makes use of C++11 inline namespaces for differing types that have the same names in the DirectX 11 and DirectX 12 version of the *DirectX Tool Kit*. This provides a link-unique name such as ``DirectX::DX11::SpriteBatch`` that will appear in linker output messages. In most use cases, however, there is no need to add explicit ``DX11`` namespace resolution in client code. diff --git a/Src/BinaryReader.cpp b/Src/BinaryReader.cpp index e1cf1436..4bb53aff 100644 --- a/Src/BinaryReader.cpp +++ b/Src/BinaryReader.cpp @@ -55,20 +55,10 @@ HRESULT BinaryReader::ReadEntireFile( *dataSize = 0; // Open the file. -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) ScopedHandle hFile(safe_handle(CreateFile2( fileName, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr))); -#else - ScopedHandle hFile(safe_handle(CreateFileW( - fileName, - GENERIC_READ, FILE_SHARE_READ, - nullptr, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, - nullptr))); -#endif - if (!hFile) return HRESULT_FROM_WIN32(GetLastError()); diff --git a/Src/GamePad.cpp b/Src/GamePad.cpp index 302a6bd3..0259d8c5 100644 --- a/Src/GamePad.cpp +++ b/Src/GamePad.cpp @@ -1286,11 +1286,6 @@ class GamePad::Impl mOwner(owner), mConnected{}, mLastReadTime{} - #if (_WIN32_WINNT < _WIN32_WINNT_WIN8) - , mLeftMotor{} - , mRightMotor{} - , mSuspended(false) - #endif { for (int j = 0; j < XUSER_MAX_COUNT; ++j) { @@ -1319,15 +1314,6 @@ class GamePad::Impl if (!ThrottleRetry(player, time)) { - #if (_WIN32_WINNT < _WIN32_WINNT_WIN8) - if (mSuspended) - { - memset(&state, 0, sizeof(State)); - state.connected = mConnected[player]; - return; - } - #endif - XINPUT_STATE xstate; const DWORD result = XInputGetState(DWORD(player), &xstate); if (result == ERROR_DEVICE_NOT_CONNECTED) @@ -1414,7 +1400,6 @@ class GamePad::Impl if (xcaps.Type == XINPUT_DEVTYPE_GAMEPAD) { static_assert(Capabilities::GAMEPAD == XINPUT_DEVSUBTYPE_GAMEPAD, "xinput.h mismatch"); - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) static_assert(XINPUT_DEVSUBTYPE_WHEEL == Capabilities::WHEEL, "xinput.h mismatch"); static_assert(XINPUT_DEVSUBTYPE_ARCADE_STICK == Capabilities::ARCADE_STICK, "xinput.h mismatch"); #ifndef __MINGW32__ @@ -1426,19 +1411,13 @@ class GamePad::Impl static_assert(XINPUT_DEVSUBTYPE_DRUM_KIT == Capabilities::DRUM_KIT, "xinput.h mismatch"); static_assert(XINPUT_DEVSUBTYPE_GUITAR_BASS == Capabilities::GUITAR_BASS, "xinput.h mismatch"); static_assert(XINPUT_DEVSUBTYPE_ARCADE_PAD == Capabilities::ARCADE_PAD, "xinput.h mismatch"); - #endif caps.gamepadType = Capabilities::Type(xcaps.SubType); } // Hard-coded VID/PID caps.vid = 0x045E; - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) caps.pid = (xcaps.Flags & XINPUT_CAPS_WIRELESS) ? 0x0719 : 0; - #else - caps.pid = 0; - #endif - return; } } @@ -1463,14 +1442,6 @@ class GamePad::Impl UNREFERENCED_PARAMETER(leftTrigger); UNREFERENCED_PARAMETER(rightTrigger); - #if (_WIN32_WINNT < _WIN32_WINNT_WIN8) - mLeftMotor[player] = leftMotor; - mRightMotor[player] = rightMotor; - - if (mSuspended) - return mConnected[player]; - #endif - XINPUT_VIBRATION xvibration; xvibration.wLeftMotorSpeed = WORD(leftMotor * 0xFFFF); xvibration.wRightMotorSpeed = WORD(rightMotor * 0xFFFF); @@ -1494,24 +1465,8 @@ class GamePad::Impl { #if (_WIN32_WINNT >= _WIN32_WINNT_WIN10) // XInput focus is handled automatically on Windows 10 - #elif (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - XInputEnable(FALSE); #else - // For XInput 9.1.0, we have to emulate the behavior of XInputEnable( FALSE ) - if (!mSuspended) - { - for (size_t j = 0; j < XUSER_MAX_COUNT; ++j) - { - if (mConnected[j]) - { - XINPUT_VIBRATION xvibration; - xvibration.wLeftMotorSpeed = xvibration.wRightMotorSpeed = 0; - std::ignore = XInputSetState(DWORD(j), &xvibration); - } - } - - mSuspended = true; - } + XInputEnable(FALSE); #endif } @@ -1519,31 +1474,8 @@ class GamePad::Impl { #if (_WIN32_WINNT >= _WIN32_WINNT_WIN10) // XInput focus is handled automatically on Windows 10 - #elif (_WIN32_WINNT >= _WIN32_WINNT_WIN8) - XInputEnable(TRUE); #else - // For XInput 9.1.0, we have to emulate the behavior of XInputEnable( TRUE ) - if (mSuspended) - { - const ULONGLONG time = GetTickCount64(); - - for (int j = 0; j < XUSER_MAX_COUNT; ++j) - { - if (mConnected[j]) - { - XINPUT_VIBRATION xvibration; - xvibration.wLeftMotorSpeed = WORD(mLeftMotor[j] * 0xFFFF); - xvibration.wRightMotorSpeed = WORD(mRightMotor[j] * 0xFFFF); - const DWORD result = XInputSetState(DWORD(j), &xvibration); - if (result == ERROR_DEVICE_NOT_CONNECTED) - { - ClearSlot(j, time); - } - } - } - - mSuspended = false; - } + XInputEnable(TRUE); #endif } @@ -1555,13 +1487,6 @@ class GamePad::Impl bool mConnected[XUSER_MAX_COUNT]; ULONGLONG mLastReadTime[XUSER_MAX_COUNT]; -#if (_WIN32_WINNT < _WIN32_WINNT_WIN8) - // Variables for emulating XInputEnable on XInput 9.1.0 - float mLeftMotor[XUSER_MAX_COUNT]; - float mRightMotor[XUSER_MAX_COUNT]; - bool mSuspended; -#endif - bool ThrottleRetry(int player, ULONGLONG time) { // This function minimizes a potential performance issue with XInput on Windows when @@ -1596,9 +1521,6 @@ class GamePad::Impl { mConnected[player] = false; mLastReadTime[player] = time; - #if (_WIN32_WINNT < _WIN32_WINNT_WIN8) - mLeftMotor[player] = mRightMotor[player] = 0.f; - #endif } int GetMostRecent() diff --git a/Src/LoaderHelpers.h b/Src/LoaderHelpers.h index 7c2eed9e..a402e779 100644 --- a/Src/LoaderHelpers.h +++ b/Src/LoaderHelpers.h @@ -395,20 +395,10 @@ namespace DirectX *bitSize = 0; // open the file - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) ScopedHandle hFile(safe_handle(CreateFile2( fileName, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr))); - #else - ScopedHandle hFile(safe_handle(CreateFileW( - fileName, - GENERIC_READ, FILE_SHARE_READ, - nullptr, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, - nullptr))); - #endif - if (!hFile) { return HRESULT_FROM_WIN32(GetLastError()); diff --git a/Src/ScreenGrab.cpp b/Src/ScreenGrab.cpp index 470e7678..7fd43444 100644 --- a/Src/ScreenGrab.cpp +++ b/Src/ScreenGrab.cpp @@ -185,19 +185,10 @@ HRESULT DirectX::SaveDDSTextureToFile( return hr; // Create file -#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) ScopedHandle hFile(safe_handle(CreateFile2( fileName, GENERIC_WRITE | DELETE, 0, CREATE_ALWAYS, nullptr))); -#else - ScopedHandle hFile(safe_handle(CreateFileW( - fileName, - GENERIC_WRITE | DELETE, 0, - nullptr, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, - nullptr))); -#endif if (!hFile) return HRESULT_FROM_WIN32(GetLastError()); @@ -495,7 +486,6 @@ HRESULT DirectX::SaveWICTextureToFile( // Screenshots don't typically include the alpha channel of the render target switch (desc.Format) { - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) case DXGI_FORMAT_R32G32B32A32_FLOAT: case DXGI_FORMAT_R16G16B16A16_FLOAT: if (IsWIC2()) @@ -507,7 +497,6 @@ HRESULT DirectX::SaveWICTextureToFile( targetGuid = GUID_WICPixelFormat24bppBGR; } break; - #endif case DXGI_FORMAT_R16G16B16A16_UNORM: targetGuid = GUID_WICPixelFormat48bppBGR; break; case DXGI_FORMAT_B5G5R5A1_UNORM: targetGuid = GUID_WICPixelFormat16bppBGR555; break; diff --git a/Src/WICTextureLoader.cpp b/Src/WICTextureLoader.cpp index ea0ce3dc..5b7ba60e 100644 --- a/Src/WICTextureLoader.cpp +++ b/Src/WICTextureLoader.cpp @@ -139,11 +139,9 @@ namespace { GUID_WICPixelFormat40bppCMYKAlpha, GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM { GUID_WICPixelFormat80bppCMYKAlpha, GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) { GUID_WICPixelFormat32bppRGB, GUID_WICPixelFormat32bppRGBA }, // DXGI_FORMAT_R8G8B8A8_UNORM { GUID_WICPixelFormat64bppRGB, GUID_WICPixelFormat64bppRGBA }, // DXGI_FORMAT_R16G16B16A16_UNORM { GUID_WICPixelFormat64bppPRGBAHalf, GUID_WICPixelFormat64bppRGBAHalf }, // DXGI_FORMAT_R16G16B16A16_FLOAT - #endif // We don't support n-channel formats }; @@ -152,7 +150,6 @@ namespace BOOL WINAPI InitializeWICFactory(PINIT_ONCE, PVOID, PVOID *ifactory) noexcept { - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) HRESULT hr = CoCreateInstance( CLSID_WICImagingFactory2, nullptr, @@ -178,14 +175,6 @@ namespace ); return SUCCEEDED(hr) ? TRUE : FALSE; } - #else - return SUCCEEDED(CoCreateInstance( - CLSID_WICImagingFactory, - nullptr, - CLSCTX_INPROC_SERVER, - __uuidof(IWICImagingFactory), - ifactory)) ? TRUE : FALSE; - #endif } } @@ -238,13 +227,11 @@ namespace return g_WICFormats[i].format; } - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) if (g_WIC2) { if (memcmp(&GUID_WICPixelFormat96bppRGBFloat, &guid, sizeof(GUID)) == 0) return DXGI_FORMAT_R32G32B32_FLOAT; } - #endif return DXGI_FORMAT_UNKNOWN; } @@ -380,7 +367,6 @@ namespace { if (memcmp(&GUID_WICPixelFormat96bppRGBFixedPoint, &pixelFormat, sizeof(WICPixelFormatGUID)) == 0) { - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) if (g_WIC2) { memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat96bppRGBFloat, sizeof(GUID)); @@ -388,7 +374,6 @@ namespace bpp = 96; } else - #endif { memcpy_s(&convertGUID, sizeof(WICPixelFormatGUID), &GUID_WICPixelFormat128bppRGBAFloat, sizeof(GUID)); format = DXGI_FORMAT_R32G32B32A32_FLOAT; @@ -425,7 +410,6 @@ namespace bpp = WICBitsPerPixel(pixelFormat); } - #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) if ((format == DXGI_FORMAT_R32G32B32_FLOAT) && d3dContext && textureView) { // Special case test for optional device support for autogen mipchains for R32G32B32_FLOAT @@ -439,7 +423,6 @@ namespace bpp = 128; } } - #endif if (loadFlags & WIC_LOADER_FORCE_RGBA32) { diff --git a/Src/pch.h b/Src/pch.h index 8b4b134b..ae02b256 100644 --- a/Src/pch.h +++ b/Src/pch.h @@ -121,6 +121,11 @@ #include #else + +#if (_WIN32_WINNT < 0x0603 /*_WIN32_WINNT_WINBLUE*/) +#error DirectX Tool Kit for Direct3D 11 requires Windows 8.1 or later +#endif + #include #endif diff --git a/XWBTool/xwbtool_Desktop_2019.vcxproj b/XWBTool/xwbtool_Desktop_2019.vcxproj index 6d5d9369..2841f6ab 100644 --- a/XWBTool/xwbtool_Desktop_2019.vcxproj +++ b/XWBTool/xwbtool_Desktop_2019.vcxproj @@ -128,7 +128,7 @@ Level4 Disabled - WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) ..\Audio;..\Src;%(AdditionalIncludeDirectories) true false @@ -149,7 +149,7 @@ Level4 Disabled - WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) ..\Audio;..\Src;%(AdditionalIncludeDirectories) true false @@ -188,7 +188,7 @@ Level4 MaxSpeed - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) ..\Audio;..\Src;%(AdditionalIncludeDirectories) Guard true @@ -211,7 +211,7 @@ Level4 MaxSpeed - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) ..\Audio;..\Src;%(AdditionalIncludeDirectories) Guard true diff --git a/XWBTool/xwbtool_Desktop_2022.vcxproj b/XWBTool/xwbtool_Desktop_2022.vcxproj index f227ec99..385e2342 100644 --- a/XWBTool/xwbtool_Desktop_2022.vcxproj +++ b/XWBTool/xwbtool_Desktop_2022.vcxproj @@ -128,7 +128,7 @@ Level4 Disabled - WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) ..\Audio;..\Src;%(AdditionalIncludeDirectories) true false @@ -149,7 +149,7 @@ Level4 Disabled - WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) ..\Audio;..\Src;%(AdditionalIncludeDirectories) true false @@ -188,7 +188,7 @@ Level4 MaxSpeed - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) ..\Audio;..\Src;%(AdditionalIncludeDirectories) Guard true @@ -211,7 +211,7 @@ Level4 MaxSpeed - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions) ..\Audio;..\Src;%(AdditionalIncludeDirectories) Guard true diff --git a/build/DirectXTK-GitHub-Dev17.yml b/build/DirectXTK-GitHub-Dev17.yml index c7ffe901..d3764097 100644 --- a/build/DirectXTK-GitHub-Dev17.yml +++ b/build/DirectXTK-GitHub-Dev17.yml @@ -47,16 +47,6 @@ jobs: - checkout: self clean: true fetchTags: false - - task: NuGetToolInstaller@1 - displayName: 'Use NuGet' - - task: NuGetAuthenticate@1 - displayName: 'NuGet Auth' - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - solution: DirectXTK_Desktop_2022_Win7.sln - feedRestore: $(GUID_FEED) - includeNuGetOrg: false - task: VSBuild@1 displayName: Build solution DirectXTK_Desktop_2022.sln 32dbg inputs: @@ -89,38 +79,6 @@ jobs: platform: x64 configuration: Release msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2022_Win7.sln 32dbg - inputs: - solution: DirectXTK_Desktop_2022_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Debug - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2022_Win7.sln 32rel - inputs: - solution: DirectXTK_Desktop_2022_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Release - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2022_Win7.sln 64dbg - inputs: - solution: DirectXTK_Desktop_2022_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Debug - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2022_Win7.sln 64rel - inputs: - solution: DirectXTK_Desktop_2022_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Release - msbuildArchitecture: x64 - task: CmdLine@2 displayName: 'Reclaim diskspace' inputs: diff --git a/build/DirectXTK-GitHub-MinGW.yml b/build/DirectXTK-GitHub-MinGW.yml index cf45b91c..c43f5008 100644 --- a/build/DirectXTK-GitHub-MinGW.yml +++ b/build/DirectXTK-GitHub-MinGW.yml @@ -154,7 +154,7 @@ jobs: inputs: cwd: $(Build.SourcesDirectory) cmakeArgs: > - -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86 -DBUILD_XAUDIO_WIN7=ON + -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86 -DBUILD_XAUDIO_REDIST=ON -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput) -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static @@ -231,7 +231,7 @@ jobs: inputs: cwd: $(Build.SourcesDirectory) cmakeArgs: > - -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64 -DBUILD_XAUDIO_WIN7=ON + -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64 -DBUILD_XAUDIO_REDIST=ON -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput) -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static diff --git a/build/DirectXTK-GitHub-SDK-prerelease.yml b/build/DirectXTK-GitHub-SDK-prerelease.yml index ceaeaf03..e96b6d89 100644 --- a/build/DirectXTK-GitHub-SDK-prerelease.yml +++ b/build/DirectXTK-GitHub-SDK-prerelease.yml @@ -91,12 +91,6 @@ jobs: SourceFolder: build Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - selectOrConfig: config - nugetConfigPath: NuGet.Config - task: VSBuild@1 displayName: Build solution DirectXTK_Desktop_2019.sln 32dbg inputs: @@ -125,34 +119,6 @@ jobs: msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32dbg - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32rel - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Release - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019.sln 64dbg - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 64rel - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Release - task: CmdLine@2 displayName: 'Reclaim diskspace' inputs: diff --git a/build/DirectXTK-GitHub-SDK-release.yml b/build/DirectXTK-GitHub-SDK-release.yml index affb9696..274fc1ea 100644 --- a/build/DirectXTK-GitHub-SDK-release.yml +++ b/build/DirectXTK-GitHub-SDK-release.yml @@ -91,12 +91,6 @@ jobs: SourceFolder: build Contents: 'Directory.Build.props' TargetFolder: $(Build.SourcesDirectory) - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - selectOrConfig: config - nugetConfigPath: NuGet.Config - task: VSBuild@1 displayName: Build solution DirectXTK_Desktop_2019.sln 32dbg inputs: @@ -125,34 +119,6 @@ jobs: msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32dbg - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32rel - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Release - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019.sln 64dbg - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 64rel - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Release - task: CmdLine@2 displayName: 'Reclaim diskspace' inputs: diff --git a/build/DirectXTK-GitHub-Test-Dev17.yml b/build/DirectXTK-GitHub-Test-Dev17.yml index b83910db..f471200b 100644 --- a/build/DirectXTK-GitHub-Test-Dev17.yml +++ b/build/DirectXTK-GitHub-Test-Dev17.yml @@ -160,76 +160,6 @@ jobs: configuration: Release msbuildArchitecture: x64 -- job: DESKTOP_BUILD_WIN7 - displayName: 'Win32 Desktop for Windows 7' - timeoutInMinutes: 60 - workspace: - clean: all - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: testRepo - displayName: Fetch Tests - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/Tests' - - task: NuGetToolInstaller@1 - displayName: 'Use NuGet' - - task: NuGetAuthenticate@1 - displayName: 'NuGet Auth' - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - feedRestore: $(GUID_FEED) - includeNuGetOrg: false - - task: NuGetCommand@2 - displayName: NuGet restore tests - inputs: - solution: Tests\DirectXTK_Tests_Desktop_2019_Win7.sln - feedRestore: $(GUID_FEED) - includeNuGetOrg: false - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Desktop_2022_Win7.sln 32dbg - inputs: - solution: Tests/DirectXTK_Tests_Desktop_2022_Win7.sln - vsVersion: 17.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Debug - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Desktop_2022_Win7.sln 32rel - inputs: - solution: Tests/DirectXTK_Tests_Desktop_2022_Win7.sln - vsVersion: 17.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Release - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Desktop_2022_Win7.sln 64rel - inputs: - solution: Tests/DirectXTK_Tests_Desktop_2022_Win7.sln - vsVersion: 17.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Release - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Desktop_2022_Win7.sln 64dbg - inputs: - solution: Tests/DirectXTK_Tests_Desktop_2022_Win7.sln - vsVersion: 17.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Debug - msbuildArchitecture: x64 - - job: CMAKE_BUILD_X64 displayName: 'CMake for X64 BUILD_TESTING=ON' timeoutInMinutes: 60 diff --git a/build/DirectXTK-GitHub-Test.yml b/build/DirectXTK-GitHub-Test.yml index f84d201f..4e6b7adf 100644 --- a/build/DirectXTK-GitHub-Test.yml +++ b/build/DirectXTK-GitHub-Test.yml @@ -148,70 +148,6 @@ jobs: platform: ARM64 configuration: Release -- job: DESKTOP_BUILD_WIN7 - displayName: 'Win32 Desktop for Windows 7' - timeoutInMinutes: 120 - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: testRepo - displayName: Fetch Tests - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/Tests' - - task: NuGetToolInstaller@1 - displayName: 'Use NuGet' - - task: NuGetAuthenticate@1 - displayName: 'NuGet Auth' - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - feedRestore: $(GUID_FEED) - includeNuGetOrg: false - - task: NuGetCommand@2 - displayName: NuGet restore tests - inputs: - solution: Tests\DirectXTK_Tests_Desktop_2019_Win7.sln - feedRestore: $(GUID_FEED) - includeNuGetOrg: false - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Desktop_2019_Win7.sln 32dbg - inputs: - solution: Tests/DirectXTK_Tests_Desktop_2019_Win7.sln - vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Desktop_2019_Win7.sln 32rel - inputs: - solution: Tests/DirectXTK_Tests_Desktop_2019_Win7.sln - vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Release - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Desktop_2019_Win7.sln 64rel - inputs: - solution: Tests/DirectXTK_Tests_Desktop_2019_Win7.sln - vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Release - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Desktop_2019_Win7.sln 64dbg - inputs: - solution: Tests/DirectXTK_Tests_Desktop_2019_Win7.sln - vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Debug - - job: UWP_BUILD_X64 displayName: 'Universal Windows Platform (UWP) for x64' timeoutInMinutes: 120 diff --git a/build/DirectXTK-GitHub.yml b/build/DirectXTK-GitHub.yml index c2ccbdd1..f8a31a1d 100644 --- a/build/DirectXTK-GitHub.yml +++ b/build/DirectXTK-GitHub.yml @@ -47,16 +47,6 @@ jobs: - checkout: self clean: true fetchTags: false - - task: NuGetToolInstaller@1 - displayName: 'Use NuGet' - - task: NuGetAuthenticate@1 - displayName: 'NuGet Auth' - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - feedRestore: $(GUID_FEED) - includeNuGetOrg: false - task: VSBuild@1 displayName: Build solution DirectXTK_Desktop_2019.sln 32dbg inputs: @@ -85,34 +75,6 @@ jobs: msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32dbg - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 32rel - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x86 - configuration: Release - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019.sln 64dbg - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTK_Desktop_2019_Win7.sln 64rel - inputs: - solution: DirectXTK_Desktop_2019_Win7.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: x64 - configuration: Release - task: CmdLine@2 displayName: 'Reclaim diskspace' inputs: