diff options
| author | crueter <crueter@eden-emu.dev> | 2026-02-02 06:54:58 +0100 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-02-02 06:54:58 +0100 |
| commit | d0a054270eb0bb002654d5204a394f5482488763 (patch) | |
| tree | dd4cbf38d4b6d58d1d5d872bea234454573cca33 /externals | |
| parent | 2a3507c2b92a577cf9814b5722c2adc6a0012cb0 (diff) | |
[cmake] Move back to individual handling of Vulkan deps (#3450)
VUL version mismatches are solved upstream. Anything else is user error,
not that the prior solution really helped let's be real.
Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3450
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Reviewed-by: DraVee <dravee@eden-emu.dev>
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | externals/cpmfile.json | 24 |
2 files changed, 18 insertions, 11 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 271e49caaa..81e2b524e8 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -83,8 +83,9 @@ endif() # mcl AddJsonPackage(mcl) -# VulkanUtilityHeaders - pulls in headers and utility libs -AddJsonPackage(vulkan-utility-headers) +# Vulkan stuff +AddJsonPackage(vulkan-headers) +AddJsonPackage(vulkan-utility-libraries) # small hack if (NOT VulkanUtilityLibraries_ADDED) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index e9732d90de..ac7dbbe9b7 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -118,15 +118,6 @@ "git_version": "1.3.18", "find_args": "MODULE" }, - "vulkan-utility-headers": { - "package": "VulkanUtilityLibraries", - "repo": "scripts/VulkanUtilityHeaders", - "tag": "%VERSION%", - "git_version": "1.4.335", - "artifact": "VulkanUtilityHeaders.tar.zst", - "git_host": "git.crueter.xyz", - "hash": "16dac0e6586702580c4279e4cd37ffe3cf909c93eb31b5069da7af36436d47b270a9cbaac953bb66c22ed12ed67ffa096688599267f307dfb62be1bc09f79833" - }, "spirv-tools": { "package": "SPIRV-Tools", "repo": "KhronosGroup/SPIRV-Tools", @@ -281,5 +272,20 @@ "tag": "%VERSION%", "hash": "dc37a189a44ce8b5c988ca550582431a6c7eadfd3c6e709bee6277116ee803e714333e85c9e6cbb5c69346a14d6f2cc7ed96e8aa09cc5fb8a89f945059651db6", "version": "121125" + }, + "vulkan-headers": { + "repo": "KhronosGroup/Vulkan-Headers", + "package": "VulkanHeaders", + "version": "1.3.274", + "hash": "26e0ad8fa34ab65a91ca62ddc54cc4410d209a94f64f2817dcdb8061dc621539a4262eab6387e9b9aa421db3dbf2cf8e2a4b041b696d0d03746bae1f25191272", + "git_version": "1.4.342", + "tag": "v%VERSION%" + }, + "vulkan-utility-libraries": { + "repo": "KhronosGroup/Vulkan-Utility-Libraries", + "package": "VulkanUtilityLibraries", + "hash": "8147370f964fd82c315d6bb89adeda30186098427bf3efaa641d36282d42a263f31e96e4586bfd7ae0410ff015379c19aa4512ba160630444d3d8553afd1ec14", + "git_version": "1.4.342", + "tag": "v%VERSION%" } } |