Bix/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-10-16 22:37:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[cmake] fix unordered-dense deps (#380)

Browse source 
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/380
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2025-09-02 03:25:27 +02:00 • committed by crueter
parent be7a3e1e86
commit 84fadd1506
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
5 changed files with 21 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/dynarmic/externals/CMakeLists.txt vendored
View file

@ -60,12 +60,12 @@ AddJsonPackage(
# endif()
# endif()
# unordered_dense
# unordered_dense - already in root
AddJsonPackage(
NAME unordered-dense
BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}
)
# AddJsonPackage(
# NAME unordered-dense
# BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}
# )
# xbyak
# uncomment if in an independent repo

13
src/dynarmic/externals/cpmfile.json vendored
View file

@ -14,19 +14,6 @@
"MCL_INSTALL OFF"
]
},
"unordered-dense": {
"package": "unordered_dense",
"repo": "martinus/unordered_dense",
"sha": "e59d30b7b1",
"hash": "71eff7bd9ba4b9226967bacd56a8ff000946f8813167cb5664bb01e96fb79e4e220684d824fe9c59c4d1cc98c606f13aff05b7940a1ed8ab3c95d6974ee34fa0",
"find_args": "CONFIG",
"options": [
"UNORDERED_DENSE_INSTALL OFF"
],
"patches": [
"0001-cmake.patch"
]
},
"zycore": {
"package": "Zycore",
"repo": "zyantific/zycore-c",

3
src/video_core/CMakeLists.txt
View file

@ -332,7 +332,8 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS})
add_dependencies(video_core host_shaders)
target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
target_link_libraries(video_core PRIVATE sirit Vulkan::Headers Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)
target_link_libraries(video_core PRIVATE sirit Vulkan::Headers Vulkan::UtilityHeaders)
target_link_libraries(video_core PUBLIC GPUOpen::VulkanMemoryAllocator)
if (ENABLE_NSIGHT_AFTERMATH)
if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK})