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/directxtk | |
| 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/directxtk')
| -rw-r--r-- | ports/directxtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/directxtk/portfile.cmake | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 6508ceaf7..29a79263d 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,4 +1,4 @@ Source: directxtk -Version: 2019-12-31 +Version: jun2020 Homepage: https://walbourn.github.io/directxtk Description: A collection of helper classes for writing DirectX 11.x code in C++. diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 5c7fa3788..ee8dba800 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -1,14 +1,10 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic") - message(FATAL_ERROR "DirectXTK 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/DirectXTK - REF 9cac24555395925e3c1039bcbbae306da09742ed - SHA512 0cea14919cce3c31ec94826fbf65069fcd1a4654cbbf50caa9e44bad6087437e6bec4538627db18b1c5704ea27b056899040da4a7355abfbf35219b4552c07f2 + REF jun2020 + SHA512 7c310ae41816cf9390fbf584a04470206ce472032ec7da75d8cd42eb46e93457e9933c96878d792a911699343fbed4a50504b0e799f4435662a4165a3be79197 HEAD_REF master ) @@ -40,6 +36,7 @@ endif() vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/DirectXTK_${SLN_NAME}.sln + PLATFORM ${TRIPLET_SYSTEM_ARCH} ) file(INSTALL |