AuroraMiddleware/UVAtlas
1
0
Fork 0
mirror of https://github.com/microsoft/UVAtlas synced 2024-11-09 13:50:05 +00:00
Code Issues Projects Releases Wiki Activity

June 1, 2020

Browse Source
This commit is contained in:
Chuck Walbourn 2020-06-02 00:52:27 -07:00
parent e7070ee881
commit 068756522d
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.nuget/uvatlas_desktop_2017.nuspec
View File

@ -10,7 +10,7 @@
<description>This version is for Windows desktop applications using Visual Studio 2017 or Visual Studio 2019.
UVAtlas, a shared source library for creating and packing an isochart texture atlas.</description>
<releaseNotes>Matches the May 10, 2020 release on GitHub.</releaseNotes>
<releaseNotes>Matches the June 1, 2020 release on GitHub.</releaseNotes>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=512686</projectUrl>
<icon>images\icon.jpg</icon>
<license type="expression">MIT</license>

5
HISTORY.md
View File

@ -6,6 +6,11 @@ Release available for download on [GitHub](https://github.com/microsoft/UVAtlas/
## Release History
### June 1, 2020
* uvatlastool: Updated for June 2020 DirectXTex & DirectXMesh releases
* CMake project updates
* Minor code cleanup
### May 10, 2020
* Minor code review
* uvatlastool: Updated with ``-l`` switch for case-sensitive file systems

10
README.md
View File

@ -6,11 +6,11 @@ http://go.microsoft.com/fwlink/?LinkID=512686
Copyright (c) Microsoft Corporation. All rights reserved.
**May 10, 2020**
**June 1, 2020**
This package contains UVAtlas, a shared source library for creating and packing an isochart texture atlas.
This code is designed to build with Visual Studio 2017 ([15.9](https://walbourn.github.io/vs-2017-15-9-update/)), Visual Studio 2019, or clang for Windows v9. It is recommended that you make use of the Windows 10 May 2019 Update SDK ([18362](https://walbourn.github.io/windows-10-may-2019-update/)).
This code is designed to build with Visual Studio 2017 ([15.9](https://walbourn.github.io/vs-2017-15-9-update/)), Visual Studio 2019, or clang for Windows v9 or later. It is recommended that you make use of the Windows 10 May 2020 Update SDK ([19041](https://walbourn.github.io/windows-10-may-2020-update-sdk/)).
These components are designed to work without requiring any content from the legacy DirectX SDK. For details, see [Where is the DirectX SDK?](https://aka.ms/dxsdk).
@ -60,10 +60,4 @@ Sander et al. "Signal-Specialized Parametrization" Europgraphics 2002 [pdf](http
## Release Notes
* The VS 2017/2019 projects make use of ``/permissive-`` for improved C++ standard conformance. Use of a Windows 10 SDK prior to the Fall Creators Update (16299) or an Xbox One XDK prior to June 2017 QFE 4 may result in failures due to problems with the system headers. You can work around these by disabling this switch in the project files which is found in the ``<ConformanceMode>`` elements, or in some cases adding ``/Zc:twoPhase-`` to the ``<AdditionalOptions>`` elements.
* The VS 2017 projects require the 15.5 update or later. For UWP and Win32 classic desktop projects with the 15.5 - 15.7 updates, you need to install the standalone Windows 10 SDK (17763) which is otherwise included in the 15.8.6 or later update. Older VS 2017 updates will fail to load the projects due to use of the <ConformanceMode> element. If using the 15.5 or 15.6 updates, you will see ``warning D9002: ignoring unknown option '/Zc:__cplusplus'`` because this switch isn't supported until 15.7. It is safe to ignore this warning, or you can edit the project files ``<AdditionalOptions>`` elements.
* The VS 2019 projects use a ``<WindowsTargetPlatformVersion>`` of ``10.0`` which indicates to use the latest installed version. This should be Windows 10 SDK (17763) or later.
* The UWP projects and the VS 2019 Win10 classic desktop project include configurations for the ARM64 platform. These require VS 2017 (15.9 update) or VS 2019 to build, with the ARM64 toolset installed.

8
UVAtlasTool/UVAtlasTool_2017.vcxproj
View File

@ -339,14 +339,14 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\directxmesh_desktop_2017.2020.5.10.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2020.5.10.1\build\native\directxmesh_desktop_2017.targets')" />
<Import Project="..\packages\directxtex_desktop_2017.2020.5.11.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2020.5.11.1\build\native\directxtex_desktop_2017.targets')" />
<Import Project="..\packages\directxmesh_desktop_2017.2020.6.2.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2020.6.2.1\build\native\directxmesh_desktop_2017.targets')" />
<Import Project="..\packages\directxtex_desktop_2017.2020.6.2.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2020.6.2.1\build\native\directxtex_desktop_2017.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2020.5.10.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2020.5.10.1\build\native\directxmesh_desktop_2017.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2017.2020.5.11.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2020.5.11.1\build\native\directxtex_desktop_2017.targets'))" />
<Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2020.6.2.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2020.6.2.1\build\native\directxmesh_desktop_2017.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2017.2020.6.2.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2020.6.2.1\build\native\directxtex_desktop_2017.targets'))" />
</Target>
</Project>

8
UVAtlasTool/UVAtlasTool_2019.vcxproj
View File

@ -339,14 +339,14 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\directxmesh_desktop_2017.2020.5.10.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2020.5.10.1\build\native\directxmesh_desktop_2017.targets')" />
<Import Project="..\packages\directxtex_desktop_2017.2020.5.11.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2020.5.11.1\build\native\directxtex_desktop_2017.targets')" />
<Import Project="..\packages\directxmesh_desktop_2017.2020.6.2.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2020.6.2.1\build\native\directxmesh_desktop_2017.targets')" />
<Import Project="..\packages\directxtex_desktop_2017.2020.6.2.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2020.6.2.1\build\native\directxtex_desktop_2017.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2020.5.10.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2020.5.10.1\build\native\directxmesh_desktop_2017.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2017.2020.5.11.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2020.5.11.1\build\native\directxtex_desktop_2017.targets'))" />
<Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2020.6.2.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2020.6.2.1\build\native\directxmesh_desktop_2017.targets'))" />
<Error Condition="!Exists('..\packages\directxtex_desktop_2017.2020.6.2.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2020.6.2.1\build\native\directxtex_desktop_2017.targets'))" />
</Target>
</Project>

4
UVAtlasTool/packages.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="directxmesh_desktop_2017" version="2020.5.10.1" targetFramework="native" />
<package id="directxtex_desktop_2017" version="2020.5.11.1" targetFramework="native" />
<package id="directxmesh_desktop_2017" version="2020.6.2.1" targetFramework="native" />
<package id="directxtex_desktop_2017" version="2020.6.2.1" targetFramework="native" />
</packages>