Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ashes] Updated to 2023-03-12. #30610

Merged
merged 1 commit into from
Apr 3, 2023
Merged

[ashes] Updated to 2023-03-12. #30610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions ports/ashes/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DragonJoker/Ashes
REF 0f8ad8edec1b0929ebd10247d3dd0a9ee8f8c91a
REF c532e8ff5b6f64150d24348ef40a02df4e692017
HEAD_REF master
SHA512 9f34c2f6760a74eb34fc02c5007af41a089ac8b01716f1ba3670014984ab277f02c4bbf14ce3f5996a164d24c1eb8edd525cb1c5da9fc0edbf2ccce3024cb11a
SHA512 1c5833ce898532b3ae87961743a921223e08bd80c25ef33155ee11c241f2eaca9047f2cfca8d2661bd3302d22acabc4cf13ccccd2f25a48c4ebc9976ad193c24
)

vcpkg_from_github(
OUT_SOURCE_PATH CMAKE_SOURCE_PATH
REPO DragonJoker/CMakeUtils
REF 77734eff73c8bb9861591a9e910f34f2bafa5563
REF 988f2aab2257175e8fb15a33a3a350ff92d25b89
HEAD_REF master
SHA512 f6110eafc8476f41490f7f9087a83ddf90d21f3cbf455edafd02e4805d3dd7f22ed955b8cba8a26600f080de06b19ce6c712e36f03c825fd3c4015b74d030e72
SHA512 961370c110e77f67ed6f426d410335636ca3b5812ba1837662cc5fea403791cafa443c1a25144b92aed5edfc5928eb6e706883ea7f1e68de1123845cb89acb86
)

file(REMOVE_RECURSE "${SOURCE_PATH}/CMake")
file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake")

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
direct3d11 ASHES_BUILD_RENDERER_D3D11
opengl ASHES_BUILD_RENDERER_OGL
vulkan ASHES_BUILD_RENDERER_VKN
)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
Expand All @@ -27,6 +32,7 @@ vcpkg_cmake_configure(
-DASHES_BUILD_TESTS=OFF
-DASHES_BUILD_INFO=OFF
-DASHES_BUILD_SAMPLES=OFF
${FEATURE_OPTIONS}
)

vcpkg_cmake_install()
Expand Down
21 changes: 18 additions & 3 deletions ports/ashes/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "ashes",
"version-date": "2022-06-08",
"version-date": "2023-03-12",
"description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.",
"homepage": "https://github.com/DragonJoker/Ashes",
"license": "MIT",
"supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static",
"supports": "!ios & !android & !uwp & !x86 & !arm32 & !static",
"dependencies": [
"opengl",
"spirv-cross",
Expand All @@ -17,5 +17,20 @@
"host": true
},
"vulkan-headers"
]
],
"default-features": [
"opengl",
"vulkan"
],
"features": {
"direct3d11": {
"description": "Compiles Direct3D11 renderer."
},
"opengl": {
"description": "Compiles OpenGL renderer."
},
"vulkan": {
"description": "Compiles Vulkan renderer."
}
}
}
5 changes: 5 additions & 0 deletions versions/a-/ashes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f2a5f4f80d32f3b72e20d5eeff4838cea13f76ef",
"version-date": "2023-03-12",
"port-version": 0
},
{
"git-tree": "f87e3684259242b878a7ab5617dd0350a6565a15",
"version-date": "2022-06-08",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
"port-version": 0
},
"ashes": {
"baseline": "2022-06-08",
"baseline": "2023-03-12",
"port-version": 0
},
"asio": {
Expand Down