Skip to content

Commit af5be51

Browse files
walbournwalbourn
authored
Add Spectre-mitigated libraries to the NuGet (#573)
1 parent 13ff4b3 commit af5be51

8 files changed

+56
-2
lines changed

‎.nuget/directxtk_desktop_2019.nuspec‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,27 @@ DirectX Tool Kit for Audio in this package uses XAudio 2.8 to support Windows 8.
5252
<file target="native\lib\x86\Debug" src="Bin\Desktop_2019\Win32\Debug\*.lib" />
5353
<file target="native\lib\x86\Debug" src="Bin\Desktop_2019\Win32\Debug\*.pdb" />
5454

55+
<file target="native\lib\x86\Debug" src="Bin\Desktop_2019\Win32\DebugSpectre\*.lib" />
56+
<file target="native\lib\x86\Debug" src="Bin\Desktop_2019\Win32\DebugSpectre\*.pdb" />
57+
5558
<file target="native\lib\x86\Release" src="Bin\Desktop_2019\Win32\Release\*.lib" />
5659
<file target="native\lib\x86\Release" src="Bin\Desktop_2019\Win32\Release\*.pdb" />
5760

61+
<file target="native\lib\x86\Release" src="Bin\Desktop_2019\Win32\ReleaseSpectre\*.lib" />
62+
<file target="native\lib\x86\Release" src="Bin\Desktop_2019\Win32\ReleaseSpectre\*.pdb" />
63+
5864
<file target="native\lib\x64\Debug" src="Bin\Desktop_2019\x64\Debug\*.lib" />
5965
<file target="native\lib\x64\Debug" src="Bin\Desktop_2019\x64\Debug\*.pdb" />
6066

67+
<file target="native\lib\x64\Debug" src="Bin\Desktop_2019\x64\DebugSpectre\*.lib" />
68+
<file target="native\lib\x64\Debug" src="Bin\Desktop_2019\x64\DebugSpectre\*.pdb" />
69+
6170
<file target="native\lib\x64\Release" src="Bin\Desktop_2019\x64\Release\*.lib" />
6271
<file target="native\lib\x64\Release" src="Bin\Desktop_2019\x64\Release\*.pdb" />
6372

73+
<file target="native\lib\x64\Release" src="Bin\Desktop_2019\x64\ReleaseSpectre\*.lib" />
74+
<file target="native\lib\x64\Release" src="Bin\Desktop_2019\x64\ReleaseSpectre\*.pdb" />
75+
6476
<file src=".nuget/directxtk_desktop_2019.targets" target="build\native" />
6577

6678
<file src=".nuget/icon.jpg" target="images\" />

‎.nuget/directxtk_desktop_2019.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

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

2123
<ItemDefinitionGroup>
2224
<Link>
2325
<AdditionalLibraryDirectories>$(directxtk-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
24-
<AdditionalDependencies>DirectXTK.lib;%(AdditionalDependencies)</AdditionalDependencies>
26+
<AdditionalDependencies>$(directxtk-LibName).lib;%(AdditionalDependencies)</AdditionalDependencies>
2527
</Link>
2628
</ItemDefinitionGroup>
2729

‎.nuget/directxtk_desktop_win10.nuspec‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,39 @@ DirectX Tool Kit for Audio in this package uses XAudio 2.9 which requires Window
5252
<file target="native\lib\x86\Debug" src="Bin\Desktop_2022_Win10\Win32\Debug\*.lib" />
5353
<file target="native\lib\x86\Debug" src="Bin\Desktop_2022_Win10\Win32\Debug\*.pdb" />
5454

55+
<file target="native\lib\x86\Debug" src="Bin\Desktop_2022_Win10\Win32\DebugSpectre\*.lib" />
56+
<file target="native\lib\x86\Debug" src="Bin\Desktop_2022_Win10\Win32\DebugSpectre\*.pdb" />
57+
5558
<file target="native\lib\x86\Release" src="Bin\Desktop_2022_Win10\Win32\Release\*.lib" />
5659
<file target="native\lib\x86\Release" src="Bin\Desktop_2022_Win10\Win32\Release\*.pdb" />
5760

61+
<file target="native\lib\x86\Release" src="Bin\Desktop_2022_Win10\Win32\ReleaseSpectre\*.lib" />
62+
<file target="native\lib\x86\Release" src="Bin\Desktop_2022_Win10\Win32\ReleaseSpectre\*.pdb" />
63+
5864
<file target="native\lib\x64\Debug" src="Bin\Desktop_2022_Win10\x64\Debug\*.lib" />
5965
<file target="native\lib\x64\Debug" src="Bin\Desktop_2022_Win10\x64\Debug\*.pdb" />
6066

67+
<file target="native\lib\x64\Debug" src="Bin\Desktop_2022_Win10\x64\DebugSpectre\*.lib" />
68+
<file target="native\lib\x64\Debug" src="Bin\Desktop_2022_Win10\x64\DebugSpectre\*.pdb" />
69+
6170
<file target="native\lib\x64\Release" src="Bin\Desktop_2022_Win10\x64\Release\*.lib" />
6271
<file target="native\lib\x64\Release" src="Bin\Desktop_2022_Win10\x64\Release\*.pdb" />
6372

73+
<file target="native\lib\x64\Release" src="Bin\Desktop_2022_Win10\x64\ReleaseSpectre\*.lib" />
74+
<file target="native\lib\x64\Release" src="Bin\Desktop_2022_Win10\x64\ReleaseSpectre\*.pdb" />
75+
6476
<file target="native\lib\ARM64\Debug" src="Bin\Desktop_2022_Win10\ARM64\Debug\*.lib" />
6577
<file target="native\lib\ARM64\Debug" src="Bin\Desktop_2022_Win10\ARM64\Debug\*.pdb" />
6678

79+
<file target="native\lib\ARM64\Debug" src="Bin\Desktop_2022_Win10\ARM64\DebugSpectre\*.lib" />
80+
<file target="native\lib\ARM64\Debug" src="Bin\Desktop_2022_Win10\ARM64\DebugSpectre\*.pdb" />
81+
6782
<file target="native\lib\ARM64\Release" src="Bin\Desktop_2022_Win10\ARM64\Release\*.lib" />
6883
<file target="native\lib\ARM64\Release" src="Bin\Desktop_2022_Win10\ARM64\Release\*.pdb" />
6984

85+
<file target="native\lib\ARM64\Release" src="Bin\Desktop_2022_Win10\ARM64\ReleaseSpectre\*.lib" />
86+
<file target="native\lib\ARM64\Release" src="Bin\Desktop_2022_Win10\ARM64\ReleaseSpectre\*.pdb" />
87+
7088
<file src=".nuget/directxtk_desktop_win10.targets" target="build\native" />
7189

7290
<file src=".nuget/icon.jpg" target="images\" />

‎.nuget/directxtk_desktop_win10.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

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

2123
<ItemDefinitionGroup>
2224
<Link>
2325
<AdditionalLibraryDirectories>$(directxtk-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
24-
<AdditionalDependencies>DirectXTK.lib;%(AdditionalDependencies)</AdditionalDependencies>
26+
<AdditionalDependencies>$(directxtk-LibName).lib;%(AdditionalDependencies)</AdditionalDependencies>
2527
</Link>
2628
</ItemDefinitionGroup>
2729

‎DirectXTK_Desktop_2019.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,11 @@
248248
<IntDir>Bin\Desktop_2019\$(Platform)\$(Configuration)\</IntDir>
249249
<TargetName>DirectXTK</TargetName>
250250
</PropertyGroup>
251+
<PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
252+
<OutDir>Bin\Desktop_2019\$(Platform)\$(Configuration)Spectre\</OutDir>
253+
<IntDir>Bin\Desktop_2019\$(Platform)\$(Configuration)Spectre\</IntDir>
254+
<TargetName>DirectXTK_Spectre</TargetName>
255+
</PropertyGroup>
251256
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
252257
<ClCompile>
253258
<PrecompiledHeader>Use</PrecompiledHeader>

‎DirectXTK_Desktop_2019_Win10.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@
286286
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</IntDir>
287287
<TargetName>DirectXTK</TargetName>
288288
</PropertyGroup>
289+
<PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
290+
<OutDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\</OutDir>
291+
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\</IntDir>
292+
<TargetName>DirectXTK_Spectre</TargetName>
293+
</PropertyGroup>
289294
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
290295
<ClCompile>
291296
<PrecompiledHeader>Use</PrecompiledHeader>

‎DirectXTK_Desktop_2022.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,11 @@
248248
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)\</IntDir>
249249
<TargetName>DirectXTK</TargetName>
250250
</PropertyGroup>
251+
<PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
252+
<OutDir>Bin\Desktop_2022\$(Platform)\$(Configuration)Spectre\</OutDir>
253+
<IntDir>Bin\Desktop_2022\$(Platform)\$(Configuration)Spectre\</IntDir>
254+
<TargetName>DirectXTK_Spectre</TargetName>
255+
</PropertyGroup>
251256
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
252257
<ClCompile>
253258
<PrecompiledHeader>Use</PrecompiledHeader>

‎DirectXTK_Desktop_2022_Win10.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,11 @@
286286
<IntDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\</IntDir>
287287
<TargetName>DirectXTK</TargetName>
288288
</PropertyGroup>
289+
<PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
290+
<OutDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)Spectre\</OutDir>
291+
<IntDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)Spectre\</IntDir>
292+
<TargetName>DirectXTK_Spectre</TargetName>
293+
</PropertyGroup>
289294
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
290295
<ClCompile>
291296
<PrecompiledHeader>Use</PrecompiledHeader>

0 commit comments

Comments
 (0)