Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build for a Windows 8.1 minimum #517

Merged
merged 14 commits into from
Dec 12, 2024
Merged

Build for a Windows 8.1 minimum #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c86e290
Build for a Windows 8.1 minimum
walbourn Dec 6, 2024
e53749c
Assume WIC2 types always available
walbourn Dec 6, 2024
b233333
Always use CreateFile2 / GetOverlappedResultEx
walbourn Dec 6, 2024
fa0f1e5
Remove support for XInput 9.1.0
walbourn Dec 6, 2024
7483887
Remove Win7 REDIST MSBuild projects
walbourn Dec 6, 2024
9a2bc11
CMake BUILD_XAUDIO_WIN7 now BUILD_XAUDIO_REDIST
walbourn Dec 6, 2024
825850a
Remove Win7 from YAML
walbourn Dec 6, 2024
aaad43a
Cmake code review
walbourn Dec 6, 2024
159fd83
Update gha
walbourn Dec 11, 2024
20d9de7
Update nuspec for Win8.1 min
walbourn Dec 11, 2024
c6cb94c
Merged XAudio 2.8 into mainline Desktop solution
walbourn Dec 11, 2024
fec9f70
Update readme
walbourn Dec 11, 2024
42910c4
Ensure proper _WIN32_WINNT value when building with nugets
walbourn Dec 11, 2024
f45b134
Add guard for too old an OS build
walbourn Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .github/workflows/msbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,21 @@ 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

- name: 'Build (Windows 10)'
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

Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/vcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"

Expand Down
13 changes: 1 addition & 12 deletions .nuget/directxtk_desktop_2019.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ VertexTypes - structures for commonly used vertex data formats
WICTextureLoader - WIC-based image file texture loader</description>
<releaseNotes>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.</releaseNotes>
DirectX Tool Kit for Audio in this package uses XAudio 2.8 to support Windows 8.1.</releaseNotes>
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
<repository type="git" url="https://github.com/microsoft/DirectXTK.git" />
<icon>images\icon.jpg</icon>
Expand All @@ -41,9 +41,6 @@ DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to s
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
<tags>DirectX DirectXTK native nativepackage</tags>
<dependencies>
<dependency id="Microsoft.XAudio2.Redist" version="1.2.11" />
</dependencies>
</metadata>

<files>
Expand All @@ -54,23 +51,15 @@ DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to s

<file target="native\lib\x86\Debug" src="Bin\Desktop_2019\Win32\Debug\*.lib" />
<file target="native\lib\x86\Debug" src="Bin\Desktop_2019\Win32\Debug\*.pdb" />
<file target="native\lib\x86\Debug" src="Audio\Bin\Desktop_2019_Win7\Win32\Debug\*.lib" />
<file target="native\lib\x86\Debug" src="Audio\Bin\Desktop_2019_Win7\Win32\Debug\*.pdb" />

<file target="native\lib\x86\Release" src="Bin\Desktop_2019\Win32\Release\*.lib" />
<file target="native\lib\x86\Release" src="Bin\Desktop_2019\Win32\Release\*.pdb" />
<file target="native\lib\x86\Release" src="Audio\Bin\Desktop_2019_Win7\Win32\Release\*.lib" />
<file target="native\lib\x86\Release" src="Audio\Bin\Desktop_2019_Win7\Win32\Release\*.pdb" />

<file target="native\lib\x64\Debug" src="Bin\Desktop_2019\x64\Debug\*.lib" />
<file target="native\lib\x64\Debug" src="Bin\Desktop_2019\x64\Debug\*.pdb" />
<file target="native\lib\x64\Debug" src="Audio\Bin\Desktop_2019_Win7\x64\Debug\*.lib" />
<file target="native\lib\x64\Debug" src="Audio\Bin\Desktop_2019_Win7\x64\Debug\*.pdb" />

<file target="native\lib\x64\Release" src="Bin\Desktop_2019\x64\Release\*.lib" />
<file target="native\lib\x64\Release" src="Bin\Desktop_2019\x64\Release\*.pdb" />
<file target="native\lib\x64\Release" src="Audio\Bin\Desktop_2019_Win7\x64\Release\*.lib" />
<file target="native\lib\x64\Release" src="Audio\Bin\Desktop_2019_Win7\x64\Release\*.pdb" />

<file src=".nuget/directxtk_desktop_2019.targets" target="build\native" />

Expand Down
4 changes: 2 additions & 2 deletions .nuget/directxtk_desktop_2019.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<ItemDefinitionGroup>
<Link>
<AdditionalLibraryDirectories>$(directxtk-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>DirectXTK.lib;DirectXTKAudioWin7.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>DirectXTK.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>

<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>HAS_DIRECTXTK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>HAS_DIRECTXTK;_WIN32_WINNT=0x0603;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
Expand Down
2 changes: 1 addition & 1 deletion .nuget/directxtk_desktop_win10.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>HAS_DIRECTXTK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>HAS_DIRECTXTK;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
Expand Down
216 changes: 0 additions & 216 deletions Audio/DirectXTKAudio_Desktop_2019_Win7.vcxproj
View file
Open in desktop

This file was deleted.

Loading
Loading