Skip to content

Add Spectre-mitigated libraries to the NuGet #573

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

Merged
walbourn merged 1 commit into from
Jul 25, 2025
Merged

Add Spectre-mitigated libraries to the NuGet #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions .nuget/directxtk_desktop_2019.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,27 @@ 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="Bin\Desktop_2019\Win32\DebugSpectre\*.lib" />
<file target="native\lib\x86\Debug" src="Bin\Desktop_2019\Win32\DebugSpectre\*.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="Bin\Desktop_2019\Win32\ReleaseSpectre\*.lib" />
<file target="native\lib\x86\Release" src="Bin\Desktop_2019\Win32\ReleaseSpectre\*.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="Bin\Desktop_2019\x64\DebugSpectre\*.lib" />
<file target="native\lib\x64\Debug" src="Bin\Desktop_2019\x64\DebugSpectre\*.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="Bin\Desktop_2019\x64\ReleaseSpectre\*.lib" />
<file target="native\lib\x64\Release" src="Bin\Desktop_2019\x64\ReleaseSpectre\*.pdb" />

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

<file src=".nuget/icon.jpg" target="images\" />
Expand Down
4 changes: 3 additions & 1 deletion .nuget/directxtk_desktop_2019.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

<PropertyGroup>
<directxtk-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(PlatformTarget)\$(NuGetConfiguration)</directxtk-LibPath>
<directxtk-LibName Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">DirectXTK_Spectre</directxtk-LibName>
<directxtk-LibName Condition="'$(directxtk-LibName)'==''">DirectXTK</directxtk-LibName>
</PropertyGroup>

<ItemDefinitionGroup>
<Link>
<AdditionalLibraryDirectories>$(directxtk-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>DirectXTK.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(directxtk-LibName).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>

Expand Down
18 changes: 18 additions & 0 deletions .nuget/directxtk_desktop_win10.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,39 @@ DirectX Tool Kit for Audio in this package uses XAudio 2.9 which requires Window
<file target="native\lib\x86\Debug" src="Bin\Desktop_2022_Win10\Win32\Debug\*.lib" />
<file target="native\lib\x86\Debug" src="Bin\Desktop_2022_Win10\Win32\Debug\*.pdb" />

<file target="native\lib\x86\Debug" src="Bin\Desktop_2022_Win10\Win32\DebugSpectre\*.lib" />
<file target="native\lib\x86\Debug" src="Bin\Desktop_2022_Win10\Win32\DebugSpectre\*.pdb" />

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

<file target="native\lib\x86\Release" src="Bin\Desktop_2022_Win10\Win32\ReleaseSpectre\*.lib" />
<file target="native\lib\x86\Release" src="Bin\Desktop_2022_Win10\Win32\ReleaseSpectre\*.pdb" />

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

<file target="native\lib\x64\Debug" src="Bin\Desktop_2022_Win10\x64\DebugSpectre\*.lib" />
<file target="native\lib\x64\Debug" src="Bin\Desktop_2022_Win10\x64\DebugSpectre\*.pdb" />

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

<file target="native\lib\x64\Release" src="Bin\Desktop_2022_Win10\x64\ReleaseSpectre\*.lib" />
<file target="native\lib\x64\Release" src="Bin\Desktop_2022_Win10\x64\ReleaseSpectre\*.pdb" />

<file target="native\lib\ARM64\Debug" src="Bin\Desktop_2022_Win10\ARM64\Debug\*.lib" />
<file target="native\lib\ARM64\Debug" src="Bin\Desktop_2022_Win10\ARM64\Debug\*.pdb" />

<file target="native\lib\ARM64\Debug" src="Bin\Desktop_2022_Win10\ARM64\DebugSpectre\*.lib" />
<file target="native\lib\ARM64\Debug" src="Bin\Desktop_2022_Win10\ARM64\DebugSpectre\*.pdb" />

<file target="native\lib\ARM64\Release" src="Bin\Desktop_2022_Win10\ARM64\Release\*.lib" />
<file target="native\lib\ARM64\Release" src="Bin\Desktop_2022_Win10\ARM64\Release\*.pdb" />

<file target="native\lib\ARM64\Release" src="Bin\Desktop_2022_Win10\ARM64\ReleaseSpectre\*.lib" />
<file target="native\lib\ARM64\Release" src="Bin\Desktop_2022_Win10\ARM64\ReleaseSpectre\*.pdb" />

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

<file src=".nuget/icon.jpg" target="images\" />
Expand Down
4 changes: 3 additions & 1 deletion .nuget/directxtk_desktop_win10.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@

<PropertyGroup>
<directxtk-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(PlatformTarget)\$(NuGetConfiguration)</directxtk-LibPath>
<directxtk-LibName Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">DirectXTK_Spectre</directxtk-LibName>
<directxtk-LibName Condition="'$(directxtk-LibName)'==''">DirectXTK</directxtk-LibName>
</PropertyGroup>

<ItemDefinitionGroup>
<Link>
<AdditionalLibraryDirectories>$(directxtk-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>DirectXTK.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(directxtk-LibName).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>

Expand Down
5 changes: 5 additions & 0 deletions DirectXTK_Desktop_2019.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,11 @@
<IntDir>Bin\Desktop_2019\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
<OutDir>Bin\Desktop_2019\$(Platform)\$(Configuration)Spectre\</OutDir>
<IntDir>Bin\Desktop_2019\$(Platform)\$(Configuration)Spectre\</IntDir>
<TargetName>DirectXTK_Spectre</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand Down
5 changes: 5 additions & 0 deletions DirectXTK_Desktop_2019_Win10.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,11 @@
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
<OutDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\</OutDir>
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\</IntDir>
<TargetName>DirectXTK_Spectre</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand Down
5 changes: 5 additions & 0 deletions DirectXTK_Desktop_2022.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,11 @@
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)Spectre\</OutDir>
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)Spectre\</IntDir>
<TargetName>DirectXTK_Spectre</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand Down
5 changes: 5 additions & 0 deletions DirectXTK_Desktop_2022_Win10.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,11 @@
<IntDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\</IntDir>
<TargetName>DirectXTK</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
<OutDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)Spectre\</OutDir>
<IntDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)Spectre\</IntDir>
<TargetName>DirectXTK_Spectre</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand Down
Loading