diff options
| author | Rémy Tassoux <contact@rt2.fr> | 2020-06-11 11:41:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 02:41:20 -0700 |
| commit | 5c9511e3a8a3ff6ef8ca1e320b2f4cf38ffb791d (patch) | |
| tree | 5e95a3f0e3ea41ee48b0e42b0ddd474d12c9bb7a /ports/directxtk12 | |
| parent | 6e67cb1745c68c6f7008cfa3b80496f45cbdb99c (diff) | |
| download | vcpkg-5c9511e3a8a3ff6ef8ca1e320b2f4cf38ffb791d.tar.gz vcpkg-5c9511e3a8a3ff6ef8ca1e320b2f4cf38ffb791d.zip | |
[directxtk][directxtk12][directxtex][directxmesh] Update to latest version (#11794)
* [directxtk][directxtk12][directxtex][directxmesh] Update to latest version
* [directxtex][directxtk12] Remove deprecated function
* [directxtk][directxtk12][directxtex][directxmesh] Fix x86 platform build error
Diffstat (limited to 'ports/directxtk12')
| -rw-r--r-- | ports/directxtk12/CONTROL | 2 | ||||
| -rw-r--r-- | ports/directxtk12/portfile.cmake | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL index cd3f00b7b..90007bd69 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,4 +1,4 @@ Source: directxtk12
-Version: dec2019
+Version: jun2020
Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12
Description: A collection of helper classes for writing DirectX 12 code in C++.
diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 52f8897a6..fd2994d4b 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,16 +1,10 @@ -include(vcpkg_common_functions) - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic") - message(FATAL_ERROR "DirectXTK12 only supports dynamic CRT linkage") -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF dec2019 - SHA512 2144c7a51ea73efea5ad4db3b0b92bfc5a2ca57c38e7f6702ce82a09049266a3aaad4500856a964c4069aa711973d3a10cb3b133397ec93bda3a4a0328b9d81c + REF jun2020 + SHA512 32744ead91216e6e19fb7f8de4924cdb5eba1d04ff7c17d41dd9f497f848c031ac9ec03924d389af2ef893f93995a0f05ffb682383c4ec37253189e405a8eae0 HEAD_REF master ) @@ -38,6 +32,7 @@ endif() vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/DirectXTK_${SLN_NAME}.sln + PLATFORM ${TRIPLET_SYSTEM_ARCH} ) file(INSTALL |