Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[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
This commit is contained in:
Rémy Tassoux 2020-06-11 11:41:20 +02:00 committed by GitHub
parent 6e67cb1745
commit 5c9511e3a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/directxmesh/CONTROL
View File

@ -1,4 +1,4 @@
Source: directxmesh
Version: dec2019-1
Version: jun2020
Homepage: https://walbourn.github.io/directxmesh
Description: DirectXMesh geometry processing library

6
ports/directxmesh/portfile.cmake
View File

@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXMesh
REF dec2019
SHA512 b48b144172574d56775f7607d7ee7370b427fd95ab4e3089cdaf79b6cbd7fc4bbc15264d9a6703840b763bc2f4a5974594afa39f113960df34e07adfd74561d6
REF jun2020
SHA512 1421c0bbe76ec9ea2fb3c61dacdede73ecfc1a2d0149cf70d0aca87ed91b87846f7b4581438e0dd8058d082092a872fbd432070f54c8b1d981d03b0db75e41d5
HEAD_REF master
)
@ -46,7 +46,7 @@ endif()
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/DirectXMesh_${SLN_NAME}.sln
PLATFORM ${BUILD_ARCH}
PLATFORM ${TRIPLET_SYSTEM_ARCH}
)
file(INSTALL

2
ports/directxtex/CONTROL
View File

@ -1,4 +1,4 @@
Source: directxtex
Version: dec2019
Version: jun2020
Homepage: https://walbourn.github.io/directxtex
Description: DirectXTex texture processing library

14
ports/directxtex/portfile.cmake
View File

@ -1,16 +1,10 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "DirectXTex 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/DirectXTex
REF dec2019
SHA512 b0c7fdeb2f035186eddeb543cd16813c6807b9646367cd309082bd164ab484001dee912249d5570e3ddf5abb90cb3e7c0355a3c18c2e2bd2a051292b65a293f6
REF jun2020
SHA512 cc0ef27f047c34aeb7aa19d1cae66e4b02d3c817a56fd983635178dc2d17d66728ccf6756b11f65376aa17e8622b923a359d0d0d8df94edf9e755ecf2e401c19
HEAD_REF master
)
@ -42,7 +36,7 @@ endif()
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/DirectXTex_${SLN_NAME}.sln
PLATFORM ${BUILD_ARCH}
PLATFORM ${TRIPLET_SYSTEM_ARCH}
)
file(INSTALL

2
ports/directxtk/CONTROL
View File

@ -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++.

11
ports/directxtk/portfile.cmake
View File

@ -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

2
ports/directxtk12/CONTROL
View File

@ -1,4 +1,4 @@
Source: directxtk12
Version: dec2019
Version: jun2020
Homepage: https://walbourn.github.io/directx-tool-kit-for-directx-12
Description: A collection of helper classes for writing DirectX 12 code in C++.

13
ports/directxtk12/portfile.cmake
View File

@ -1,16 +1,10 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "DirectXTK12 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/DirectXTK12
REF dec2019
SHA512 2144c7a51ea73efea5ad4db3b0b92bfc5a2ca57c38e7f6702ce82a09049266a3aaad4500856a964c4069aa711973d3a10cb3b133397ec93bda3a4a0328b9d81c
REF jun2020
SHA512 32744ead91216e6e19fb7f8de4924cdb5eba1d04ff7c17d41dd9f497f848c031ac9ec03924d389af2ef893f93995a0f05ffb682383c4ec37253189e405a8eae0
HEAD_REF master
)
@ -38,6 +32,7 @@ endif()
vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/DirectXTK_${SLN_NAME}.sln
PLATFORM ${TRIPLET_SYSTEM_ARCH}
)
file(INSTALL