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

[dstorage, xaudio2redist] updated port to work for arm64ec (#40161)

Browse Source
This commit is contained in:
Chuck Walbourn 2024-07-29 23:02:11 -07:00 committed by GitHub
parent 07816f78b0
commit 3a68779f3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/dstorage/portfile.cmake
View File

@ -14,13 +14,21 @@ vcpkg_extract_source_archive(
NO_REMOVE_ONE_LEVEL
)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
set(DS_ARCH arm64)
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
set(DS_ARCH x86)
else()
set(DS_ARCH x64)
endif()
file(INSTALL "${PACKAGE_PATH}/native/include/dstorage.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(INSTALL "${PACKAGE_PATH}/native/include/dstorageerr.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
file(INSTALL "${PACKAGE_PATH}/native/lib/${VCPKG_TARGET_ARCHITECTURE}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
file(INSTALL "${PACKAGE_PATH}/native/lib/${DS_ARCH}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(COPY "${PACKAGE_PATH}/native/bin/${DS_ARCH}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(COPY "${PACKAGE_PATH}/native/bin/${DS_ARCH}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug")
file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug")

1
ports/dstorage/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "dstorage",
"version": "1.2.3",
"port-version": 1,
"description": "DirectStorage for Windows",
"homepage": "https://aka.ms/directstorage/",
"documentation": "https://github.com/microsoft/DirectStorage",

22
ports/xaudio2redist/portfile.cmake
View File

@ -13,31 +13,37 @@ vcpkg_extract_source_archive(
NO_REMOVE_ONE_LEVEL
)
if(XAUDIO_ARCH STREQUAL "x86")
set(XAUDIO_ARCH x86)
else()
set(XAUDIO_ARCH x64)
endif()
file(GLOB HEADER_FILES "${PACKAGE_PATH}/build/native/include/*.h")
file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${XAUDIO_ARCH}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${XAUDIO_ARCH}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
set(lib_suffix "_md")
else()
file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${XAUDIO_ARCH}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
set(lib_suffix "")
endif()
file(INSTALL "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(INSTALL "${PACKAGE_PATH}/build/native/release/bin/${XAUDIO_ARCH}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
if(NOT DEFINED VCPKG_BUILD_TYPE)
file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${XAUDIO_ARCH}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${XAUDIO_ARCH}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
else()
file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${XAUDIO_ARCH}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
endif()
file(INSTALL "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
file(INSTALL "${PACKAGE_PATH}/build/native/debug/bin/${XAUDIO_ARCH}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
configure_file("${CMAKE_CURRENT_LIST_DIR}/xaudio2redist-config.cmake.in"

2
ports/xaudio2redist/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "xaudio2redist",
"version": "1.2.11",
"port-version": 2,
"port-version": 3,
"description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later",
"homepage": "https://aka.ms/XAudio2Redist",
"documentation": "https://aka.ms/XAudio2Redist",

4
versions/baseline.json
View File

@ -2374,7 +2374,7 @@
},
"dstorage": {
"baseline": "1.2.3",
"port-version": 0
"port-version": 1
},
"dtl": {
"baseline": "1.20",
@ -9570,7 +9570,7 @@
},
"xaudio2redist": {
"baseline": "1.2.11",
"port-version": 2
"port-version": 3
},
"xbitmaps": {
"baseline": "1.1.2",

5
versions/d-/dstorage.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b5b86f56e2f801673a67e2971ca39d839dd83f6b",
"version": "1.2.3",
"port-version": 1
},
{
"git-tree": "53c80dd514155b13089dca50cc53d539af8503eb",
"version": "1.2.3",

5
versions/x-/xaudio2redist.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aa6ba77559dd683ed82dc24204784c5d3c280dae",
"version": "1.2.11",
"port-version": 3
},
{
"git-tree": "f6cb8fa89efa0d50385ddfb245b02ea67197b0d6",
"version": "1.2.11",