3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 05:38:00 +08:00
Code Issues Projects Releases Wiki Activity

[dxsdk-d3dx] port update to support static crt scenarios (#37605)

Browse Source
This commit is contained in:
Chuck Walbourn 2024-03-22 16:32:54 -07:00 committed by GitHub
parent 2c3c678490
commit fc886ab184
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in
View File

@ -1,6 +1,5 @@
get_filename_component(_d3dx_root "${CMAKE_CURRENT_LIST_FILE}" PATH)
get_filename_component(_d3dx_root "${_d3dx_root}" PATH)
get_filename_component(_d3dx_root "${CMAKE_CURRENT_LIST_DIR}" PATH)
get_filename_component(_d3dx_root "${_d3dx_root}" PATH)
set(_d3dx_root_lib "${_d3dx_root}/lib/d3dx9.lib")

18
ports/dxsdk-d3dx/portfile.cmake
View File

@ -4,8 +4,7 @@ endif()
message(WARNING "Use of ${PORT} is not recommended for new projects. See https://aka.ms/dxsdk for more information.")
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled)
set(VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT enabled)
vcpkg_download_distfile(ARCHIVE
@ -26,15 +25,18 @@ file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT
file(GLOB RELEASE_LIB_FILES "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib")
file(INSTALL ${RELEASE_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/")
file(GLOB DEBUG_LIB_FILES "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib")
file(INSTALL ${DEBUG_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/")
file(GLOB RELEASE_DLL_FILES "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll")
file(INSTALL ${RELEASE_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/")
file(GLOB DEBUG_DLL_FILES "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll")
file(INSTALL ${DEBUG_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/")
if(NOT DEFINED VCPKG_BUILD_TYPE)
file(GLOB DEBUG_LIB_FILES "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib")
file(INSTALL ${DEBUG_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/")
file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(GLOB DEBUG_DLL_FILES "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll")
file(INSTALL ${DEBUG_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/")
endif()
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt")
configure_file("${CMAKE_CURRENT_LIST_DIR}/dxsdk-d3dx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY)

6
ports/dxsdk-d3dx/usage Normal file
View File

@ -0,0 +1,6 @@
The legacy DirectX SDK D3DX package provides CMake targets:
find_package(dxsdk-d3dx CONFIG REQUIRED)
target_link_libraries(main PRIVATE Microsoft::D3DX9 Microsoft::D3DX10 Microsoft::D3DX11)
NOTE: This port is not recommended for use in new projects and is incompatible with the deprecated directxsdk port.

4
ports/dxsdk-d3dx/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "dxsdk-d3dx",
"version": "9.29.952.8",
"port-version": 6,
"port-version": 7,
"description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.",
"homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/",
"license": null,
"supports": "windows & !arm & !uwp & !xbox & !staticcrt"
"supports": "windows & !arm & !uwp & !xbox"
}

2
versions/baseline.json
View File

@ -2366,7 +2366,7 @@
},
"dxsdk-d3dx": {
"baseline": "9.29.952.8",
"port-version": 6
"port-version": 7
},
"dxut": {
"baseline": "11.31",

5
versions/d-/dxsdk-d3dx.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e71fae4b2d12e35a21d5963aa8c59c8ebf5d6586",
"version": "9.29.952.8",
"port-version": 7
},
{
"git-tree": "bca406e04cfde4f63d430a5f2f10273701747f31",
"version": "9.29.952.8",