diff options
| author | Chuck Walbourn <walbourn@users.noreply.github.com> | 2021-01-15 15:24:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 15:24:06 -0800 |
| commit | a2cc2b1735dc260f455ef7ce6ef935646dc69329 (patch) | |
| tree | 118b55beb7805c0bb2df0185407da0b9c4af1f67 /ports/directxtk12 | |
| parent | 21b569f3e6773554b9e8284318c118bce0426f7b (diff) | |
| download | vcpkg-a2cc2b1735dc260f455ef7ce6ef935646dc69329.tar.gz vcpkg-a2cc2b1735dc260f455ef7ce6ef935646dc69329.zip | |
directxtex, directxmesh, directxtk, uvatlas ports updated to fix cach… (#15639)
* directxtex, directxmesh, directxtk, uvatlas ports updated to fix cache-collision issues
* Updated ports to jan2021b
* update baseline
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Diffstat (limited to 'ports/directxtk12')
| -rw-r--r-- | ports/directxtk12/CONTROL | 2 | ||||
| -rw-r--r-- | ports/directxtk12/portfile.cmake | 21 |
2 files changed, 14 insertions, 9 deletions
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL index fd7e367a3..73b28d2c2 100644 --- a/ports/directxtk12/CONTROL +++ b/ports/directxtk12/CONTROL @@ -1,5 +1,5 @@ Source: directxtk12 -Version: jan2021 +Version: jan2021b Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12 Description: A collection of helper classes for writing DirectX 12 code in C++. Supports: windows diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 99fcea0e8..ac32f2bce 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF jan2021 - SHA512 a6938194bc8857fe0076cb21f000aaa4ab4e207342e07f76ecea9d3f064c1b0c220a5f410c2e1184f37d98b54ef2f4852a6bc7cb13a029885bd3c39cb3f1a727 + REF jan2021b + SHA512 19e017f11fb6cd25a10fbf2597d1a0fe133a339781f5b1b333eb52224fcf5869c5e5bb5a3f3a2f57ffad527076e6780cccccfbae09c48abfce3010be688b87b5 HEAD_REF master ) @@ -20,24 +20,29 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) - vcpkg_download_distfile(makespritefont + vcpkg_download_distfile( + MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jan2021/MakeSpriteFont.exe" - FILENAME "makespritefont.exe" + FILENAME "makespritefont-jan2021.exe" SHA512 0cca19694fd3625c5130a85456f7bf1dabc8c5f893223c19da134a0c4d64de853f7871644365dcec86012543f3a59a96bfabd9e51947648f6d82480602116fc4 ) - vcpkg_download_distfile(xwbtool + vcpkg_download_distfile( + XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jan2021/XWBTool.exe" - FILENAME "xwbtool.exe" + FILENAME "xwbtool-jan2021.exe" SHA512 91c9d0da90697ba3e0ebe4afcc4c8e084045b76b26e94d7acd4fd87e5965b52dd61d26038f5eb749a3f6de07940bf6e3af8e9f19d820bf904fbdb2752b78fce9 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") file(INSTALL - ${DOWNLOADS}/makespritefont.exe - ${DOWNLOADS}/xwbtool.exe + ${MAKESPRITEFONT_EXE} + ${XWBTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk12/) + + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") |