diff options
| author | Chuck Walbourn <walbourn@users.noreply.github.com> | 2021-04-09 09:54:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 09:54:41 -0700 |
| commit | 2d7a8443acca90ac05257c7a54c11567820bc050 (patch) | |
| tree | d29ba92df42efd2652d3519d094894c33cc26b41 /ports/directxtk | |
| parent | 7ee07915db7b88519102a8001fcaebc613cb0aa4 (diff) | |
| download | vcpkg-2d7a8443acca90ac05257c7a54c11567820bc050.tar.gz vcpkg-2d7a8443acca90ac05257c7a54c11567820bc050.zip | |
[directxtex,directxmesh, directxtk, directxtk12, uvatlas] updated for April 2021 releases (#17123)
* directxmesh, directxtex, directxtk, directxtk12, uvatlas updated for April 2021 release
* Updated versions
Diffstat (limited to 'ports/directxtk')
| -rw-r--r-- | ports/directxtk/CONTROL | 5 | ||||
| -rw-r--r-- | ports/directxtk/portfile.cmake | 48 |
2 files changed, 28 insertions, 25 deletions
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL index 7224fef51..8ef3b1f3d 100644 --- a/ports/directxtk/CONTROL +++ b/ports/directxtk/CONTROL @@ -1,7 +1,8 @@ Source: directxtk -Version: jan2021b -Homepage: https://walbourn.github.io/directxtk +Version: apr2021 +Homepage: https://github.com/microsoft/DirectXTK Description: A collection of helper classes for writing DirectX 11.x code in C++. +Build-Depends: directxmath Supports: windows Feature: xaudio2-9 diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index f5541789b..56d88087a 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF jan2021b - SHA512 87cac6f3ea9e16b5b2d195fd363d5da45d99a08b4bb7be8261a7347ec0e316604acc130129cabc24d635be77ec2487341eca1c5f46238d3ce27fbde1a2e817d1 + REF apr2021 + SHA512 d64b5a6c39e9ecc4609a1db4c3121880b4e40431ec2e785aefff8e11615444485b0ffa68169cff6a5dda52f38bb2ce22161644e5fa4b757b9a84e682a458f846 HEAD_REF master ) @@ -32,31 +32,19 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -if(NOT VCPKG_TARGET_IS_UWP) - vcpkg_copy_tools( - TOOL_NAMES XWBTool - SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake - ) - - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH MakeSpriteFont/MakeSpriteFont.csproj - PLATFORM AnyCPU - ) - -elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) +if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/jan2021/MakeSpriteFont.exe" - FILENAME "makespritefont-jan2021.exe" - SHA512 0cca19694fd3625c5130a85456f7bf1dabc8c5f893223c19da134a0c4d64de853f7871644365dcec86012543f3a59a96bfabd9e51947648f6d82480602116fc4 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/apr2021/MakeSpriteFont.exe" + FILENAME "makespritefont-apr2021.exe" + SHA512 f958dc0a88ff931182914ebb4b935d4ed71297d59a61fb70dbf7769d22350abc712acfdbbfbba658781600c83ac7e390eac0663ade747f749194addd209c5bfa ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/jan2021/XWBTool.exe" - FILENAME "xwbtool-jan2021.exe" - SHA512 91c9d0da90697ba3e0ebe4afcc4c8e084045b76b26e94d7acd4fd87e5965b52dd61d26038f5eb749a3f6de07940bf6e3af8e9f19d820bf904fbdb2752b78fce9 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/apr2021/XWBTool.exe" + FILENAME "xwbtool-apr2021.exe" + SHA512 8918fe7f5c996a54c6a5032115c9b82c6fe9b61688da3cde11c0282061c17a829639b219b8ff5ac623986507338c927eb926f2c42ba3c98563dfe7e162e22305 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -66,8 +54,22 @@ elseif((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-jan2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe) + +elseif(NOT VCPKG_TARGET_IS_UWP) + + vcpkg_copy_tools( + TOOL_NAMES XWBTool + SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake + ) + + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH MakeSpriteFont/MakeSpriteFont.csproj + PLATFORM AnyCPU + ) + endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") |