The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[directxtex] Update to dec2019 release (#9383)

Browse Source 
* [directxtex] Update to dec2019 release

* [directxtex] Replace UWP detection with VCPKG_TARGET_IS_UWP
This commit is contained in:
Tatsuro Shibamura 2019-12-21 09:20:28 +09:00 committed by Robert Schumacher
parent 024350d0e1
commit 1258ac0a10
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/directxtex/CONTROL
View File

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

14
ports/directxtex/portfile.cmake
View File

@ -9,8 +9,8 @@ endif()
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXTex REPO Microsoft/DirectXTex
REF oct2019 REF dec2019
SHA512 e9768d029033a049552a19b9f047a9dbae48982d10bc8fe0427ed7e72c89340a3b04d7ae321fe87475f209536ce37b5aa7d8150a376093787f43fe85a0955edf SHA512 b0c7fdeb2f035186eddeb543cd16813c6807b9646367cd309082bd164ab484001dee912249d5570e3ddf5abb90cb3e7c0355a3c18c2e2bd2a051292b65a293f6
HEAD_REF master HEAD_REF master
) )
@ -30,10 +30,14 @@ else()
message(FATAL_ERROR "Unsupported platform toolset.") message(FATAL_ERROR "Unsupported platform toolset.")
endif() endif()
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(VCPKG_TARGET_IS_UWP)
set(SLN_NAME "Windows10_${VS_VERSION}") set(SLN_NAME "Windows10_${VS_VERSION}")
else() 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() endif()
vcpkg_build_msbuild( vcpkg_build_msbuild(
@ -55,7 +59,7 @@ file(INSTALL
${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTex.pdb ${SOURCE_PATH}/DirectXTex/Bin/${SLN_NAME}/${BUILD_ARCH}/Release/DirectXTex.pdb
DESTINATION ${CURRENT_PACKAGES_DIR}/lib) DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(NOT VCPKG_TARGET_IS_UWP AND NOT TRIPLET_SYSTEM_ARCH STREQUAL "arm64")
set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtex) set(TOOL_PATH ${CURRENT_PACKAGES_DIR}/tools/directxtex)
file(MAKE_DIRECTORY ${TOOL_PATH}) file(MAKE_DIRECTORY ${TOOL_PATH})
file(INSTALL file(INSTALL

1
scripts/ci.baseline.txt
View File

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