3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

[directxtk] Update to dec2019 release (#9381)

Browse Source 
* [directxtk] Update to dec2019 release

* [directxtk] Replace UWP detection with VCPKG_TARGET_IS_UWP
This commit is contained in:
Tatsuro Shibamura 2019-12-21 09:21:10 +09:00 committed by Robert Schumacher
parent b5657848d4
commit a732ecda63
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/directxtk/CONTROL
View File

@ -1,4 +1,4 @@
Source: directxtk
Version: oct2019
Version: dec2019
Homepage: https://walbourn.github.io/directxtk
Description: A collection of helper classes for writing DirectX 11.x code in C++.

16
ports/directxtk/portfile.cmake
View File

@ -9,8 +9,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTK
REF oct2019
SHA512 d14cc3836986d4082edd34c39fda1d8c5ba4c8bfdc8640e61a3eac61e19c1eae6c7bc9ab57a353b7dc5cc04e084b71df43174aecfbd41975ebe97f0f8e7f4a86
REF dec2019
SHA512 7a1f8e6b871552585ace70c2d40e02524c8aef274cec90cc93c25197c9eaa39f244d11082912083ad654df6f301da2076f36ac2195f3c9df278eefeda99af5a1
HEAD_REF master
)
@ -30,10 +30,14 @@ else()
message(FATAL_ERROR "Unsupported platform toolset.")
endif()
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(VCPKG_TARGET_IS_UWP)
set(SLN_NAME "Windows10_${VS_VERSION}")
else()
set(SLN_NAME "Desktop_${VS_VERSION}")
if(TRIPLET_SYSTEM_ARCH STREQUAL "arm64")
set(SLN_NAME "Desktop_${VS_VERSION}_Win10")
else()
set(SLN_NAME "Desktop_${VS_VERSION}")
endif()
endif()
vcpkg_build_msbuild(
@ -56,14 +60,14 @@ file(INSTALL
${SOURCE_PATH}/Bin/${SLN_NAME}/${BUILD_ARCH}/Debug/DirectXTK.pdb
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(NOT VCPKG_TARGET_IS_UWP)
set(DXTK_TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtk)
file(MAKE_DIRECTORY ${DXTK_TOOL_PATH})
file(INSTALL
${SOURCE_PATH}/MakeSpriteFont/bin/Release/MakeSpriteFont.exe
DESTINATION ${DXTK_TOOL_PATH})
file(INSTALL
${SOURCE_PATH}/XWBTool/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/XWBTool.exe
${SOURCE_PATH}/XWBTool/Bin/Desktop_${VS_VERSION}/${BUILD_ARCH}/Release/XWBTool.exe
DESTINATION ${DXTK_TOOL_PATH})
endif()

1
scripts/ci.baseline.txt
View File

@ -328,7 +328,6 @@ directxmesh:x64-windows-static=fail
directxtex:x64-linux=fail
directxtex:x64-osx=fail
directxtex:x64-windows-static=fail
directxtk:arm64-windows=fail
directxtk:x64-linux=fail
directxtk:x64-osx=fail
directxtk:x64-windows-static=fail