Skip to content

Commit

Permalink
[d3dx12] update port (microsoft#17749)
Browse files Browse the repository at this point in the history
* [d3dx12] Update port to latest verison

* Update baseline
  • Loading branch information
walbourn authored May 11, 2021
1 parent ce0c57a commit 3b4dd08
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
13 changes: 10 additions & 3 deletions ports/d3dx12/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
set(VERSION may2020)
set(VERSION may2021)

# The official D3DX12.H is hosted on https://github.com/microsoft/DirectX-Headers.
#
# This port uses the version from directx-vs-templates instead because it is compatible with multiple
# versions of the Windows 10 SDK. The official version only supports the 'latest' Windows 10 SDK.

message(NOTICE "Consider using the 'directx-headers' port instead. See https://aka.ms/directx12agility")

vcpkg_download_distfile(D3DX12_H
URLS "https://raw.githubusercontent.com/walbourn/directx-vs-templates/${VERSION}/d3d12game_win32_dr/d3dx12.h"
FILENAME "directx-vs-templates-${VERSION}-d3dx12.h"
SHA512 "829b72ddf861652bd96518b7d54f7a103c95b4434ec022e1551fb085e4dfc8f804e01ccdb4677e3f64367553c56d35291b305e10c2ea6186ddadaaa071c6d7a2"
SHA512 b053a8e6593c701a0827f8a52f20e160070b8b71242fd60a57617e46b87e909e11f814fc15b084b4f83b7ff5b9a562280da64a77cee3a171ef17839315df4245
)
vcpkg_download_distfile(LICENSE
URLS "https://raw.githubusercontent.com/walbourn/directx-vs-templates/${VERSION}/LICENSE"
FILENAME "directx-vs-templates-${VERSION}-LICENSE"
SHA512 "f1c9c9b83627d00ec98c9e54c4b708716731e4b0b27f38e95d21b01f8fe4e1f27eeade5d802f93caa83ede17610411ca082ea1ce79150c372f3abdceaaa9a4a3"
SHA512 ce7d8ec7bfb58ef36a95b20f6f0fc4e3cd4923bb3ac6bd1f62e8215df2ee83d2a594ce84b15951310f05a819a0370468af781e73a10e536d23965421466851f4
)

file(INSTALL "${D3DX12_H}" DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME d3dx12.h)
Expand Down
4 changes: 2 additions & 2 deletions ports/d3dx12/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "d3dx12",
"version-string": "may2020",
"version-string": "may2021",
"description": "The D3D12 Helper Library",
"homepage": "https://github.com/microsoft/DirectX-Graphics-Samples/tree/master/Libraries/D3DX12"
"homepage": "https://docs.microsoft.com/en-us/windows/win32/direct3d12/helper-structures-and-functions-for-d3d12"
}
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@
"port-version": 0
},
"d3dx12": {
"baseline": "may2020",
"baseline": "may2021",
"port-version": 0
},
"darknet": {
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/d3dx12.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "34415699a49eb16898e8190a101c6f6e026b1b3d",
"version-string": "may2021",
"port-version": 0
},
{
"git-tree": "8ee92f85b281f540bb897404333cd300bd02e015",
"version-string": "may2020",
Expand Down

0 comments on commit 3b4dd08

Please sign in to comment.