AuroraMiddleware/UVAtlas
1
0
Fork 0
mirror of https://github.com/microsoft/UVAtlas synced 2024-09-19 14:20:00 +00:00
Code Issues Projects Releases Wiki Activity

Add Spectre-mitigated libraries to the NuGet (#89)

Browse Source
This commit is contained in:
Chuck Walbourn 2022-12-15 10:30:01 -08:00 committed by GitHub
parent cd5cb6144c
commit ed784e66ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.nuget/uvatlas_desktop_2019.nuspec
View File

@ -30,18 +30,43 @@ UVAtlas, a shared source library for creating and packing an isochart texture at
<file target="native\lib\x86\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\Debug\*.lib" /> <file target="native\lib\x86\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\Debug\*.lib" />
<file target="native\lib\x86\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\Debug\*.pdb" /> <file target="native\lib\x86\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\Debug\*.pdb" />
<file target="native\lib\x86\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\DebugSpectre\*.lib" />
<file target="native\lib\x86\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\DebugSpectre\*.pdb" />
<file target="native\lib\x86\Release" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\Release\*.lib" /> <file target="native\lib\x86\Release" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\Release\*.lib" />
<file target="native\lib\x86\Release" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\Release\*.pdb" /> <file target="native\lib\x86\Release" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\Release\*.pdb" />
<file target="native\lib\x86\Release" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\ReleaseSpectre\*.lib" />
<file target="native\lib\x86\Release" src="UVAtlas\Bin\Desktop_2019_Win10\Win32\ReleaseSpectre\*.pdb" />
<file target="native\lib\x64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\x64\Debug\*.lib" /> <file target="native\lib\x64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\x64\Debug\*.lib" />
<file target="native\lib\x64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\x64\Debug\*.pdb" /> <file target="native\lib\x64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\x64\Debug\*.pdb" />
<file target="native\lib\x64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\x64\DebugSpectre\*.lib" />
<file target="native\lib\x64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\x64\DebugSpectre\*.pdb" />
<file target="native\lib\x64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\x64\Release\*.lib" /> <file target="native\lib\x64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\x64\Release\*.lib" />
<file target="native\lib\x64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\x64\Release\*.pdb" /> <file target="native\lib\x64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\x64\Release\*.pdb" />
<file target="native\lib\x64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\x64\ReleaseSpectre\*.lib" />
<file target="native\lib\x64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\x64\ReleaseSpectre\*.pdb" />
<file target="native\lib\ARM64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\ARM64\Debug\*.lib" />
<file target="native\lib\ARM64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\ARM64\Debug\*.pdb" />
<file target="native\lib\ARM64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\ARM64\DebugSpectre\*.lib" />
<file target="native\lib\ARM64\Debug" src="UVAtlas\Bin\Desktop_2019_Win10\ARM64\DebugSpectre\*.pdb" />
<file target="native\lib\ARM64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\ARM64\Release\*.lib" />
<file target="native\lib\ARM64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\ARM64\Release\*.pdb" />
<file target="native\lib\ARM64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\ARM64\ReleaseSpectre\*.lib" />
<file target="native\lib\ARM64\Release" src="UVAtlas\Bin\Desktop_2019_Win10\ARM64\ReleaseSpectre\*.pdb" />
<file src=".nuget/uvatlas_desktop_2019.targets" target="build\native" /> <file src=".nuget/uvatlas_desktop_2019.targets" target="build\native" />
<file src=".nuget/icon.jpg" target="images\" /> <file src=".nuget/icon.jpg" target="images\" />
</files> </files>
</package> </package>
Wz

4
.nuget/uvatlas_desktop_2019.targets
View File

@ -16,12 +16,14 @@
<PropertyGroup> <PropertyGroup>
<uvatlas-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(PlatformTarget)\$(NuGetConfiguration)</uvatlas-LibPath> <uvatlas-LibPath>$(MSBuildThisFileDirectory)..\..\native\lib\$(PlatformTarget)\$(NuGetConfiguration)</uvatlas-LibPath>
<uvatlas-LibName Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">UVAtlas_Spectre</uvatlas-LibName>
<uvatlas-LibName Condition="'$(uvatlas-LibName)'==''">UVAtlas</uvatlas-LibName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<Link> <Link>
<AdditionalLibraryDirectories>$(uvatlas-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(uvatlas-LibPath);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>UVAtlas.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>$(uvatlas-LibName).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>

5
UVAtlas/UVAtlas_2019_Win10.vcxproj
View File

@ -182,6 +182,11 @@
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</IntDir> <IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</IntDir>
<TargetName>UVAtlas</TargetName> <TargetName>UVAtlas</TargetName>
</PropertyGroup> </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>UVAtlas_Spectre</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>

5
UVAtlas/UVAtlas_2022_Win10.vcxproj
View File

@ -182,6 +182,11 @@
<IntDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\</IntDir> <IntDir>Bin\Desktop_2022_Win10\$(Platform)\$(Configuration)\</IntDir>
<TargetName>UVAtlas</TargetName> <TargetName>UVAtlas</TargetName>
</PropertyGroup> </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>UVAtlas_Spectre</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>