diff options
| author | Rémy Tassoux <contact@rt2.fr> | 2020-06-11 11:41:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 02:41:20 -0700 |
| commit | 5c9511e3a8a3ff6ef8ca1e320b2f4cf38ffb791d (patch) | |
| tree | 5e95a3f0e3ea41ee48b0e42b0ddd474d12c9bb7a /ports/directxtex | |
| parent | 6e67cb1745c68c6f7008cfa3b80496f45cbdb99c (diff) | |
| download | vcpkg-5c9511e3a8a3ff6ef8ca1e320b2f4cf38ffb791d.tar.gz vcpkg-5c9511e3a8a3ff6ef8ca1e320b2f4cf38ffb791d.zip | |
[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
Diffstat (limited to 'ports/directxtex')
| -rw-r--r-- | ports/directxtex/CONTROL | 2 | ||||
| -rw-r--r-- | ports/directxtex/portfile.cmake | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL index 63459b38e..296a2299b 100644 --- a/ports/directxtex/CONTROL +++ b/ports/directxtex/CONTROL @@ -1,4 +1,4 @@ Source: directxtex
-Version: dec2019
+Version: jun2020
Homepage: https://walbourn.github.io/directxtex
Description: DirectXTex texture processing library
\ No newline at end of file diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 0b19ded36..51c15218c 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -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
|