Merged XAudio 2.8 into mainline Desktop solution

microsoft · Dec 11, 2024 · c6cb94c · c6cb94c
1 parent 20d9de7
commit c6cb94c
Show file tree

Hide file tree

Showing 13 changed files with 142 additions and 593 deletions.
diff --git 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
 
@@ -52,7 +52,7 @@ jobs:
       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/.nuget/directxtk_desktop_2019.nuspec b/.nuget/directxtk_desktop_2019.nuspec
@@ -51,23 +51,15 @@ DirectX Tool Kit for Audio in this package uses XAudio 2.8 to support Windows 8.
 
         <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_Win8\Win32\Debug\*.lib" />
-        <file target="native\lib\x86\Debug" src="Audio\Bin\Desktop_2019_Win8\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_Win8\Win32\Release\*.lib" />
-        <file target="native\lib\x86\Release" src="Audio\Bin\Desktop_2019_Win8\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_Win8\x64\Debug\*.lib" />
-        <file target="native\lib\x64\Debug" src="Audio\Bin\Desktop_2019_Win8\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_Win8\x64\Release\*.lib" />
-        <file target="native\lib\x64\Release" src="Audio\Bin\Desktop_2019_Win8\x64\Release\*.pdb" />
 
         <file src=".nuget/directxtk_desktop_2019.targets" target="build\native" />
 

diff --git a/.nuget/directxtk_desktop_2019.targets b/.nuget/directxtk_desktop_2019.targets
@@ -21,7 +21,7 @@
   <ItemDefinitionGroup>
     <Link>
       <AdditionalLibraryDirectories>$(directxtk-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>DirectXTK.lib;DirectXTKAudioWin8.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>DirectXTK.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 

diff --git a/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj b/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj
diff --git a/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj.filters b/Audio/DirectXTKAudio_Desktop_2019_Win8.vcxproj.filters