eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[cmake] move unordered_dense to root; dynarmic uses root propagation
All checks were successful
eden-license / license-header (pull_request) Successful in 26s
Details

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-09-04 09:35:32 -04:00
parent e13f81eb60
commit 3ba1d53794
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
4 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
externals/CMakeLists.txt vendored
View file

@ -95,6 +95,9 @@ if (ENABLE_WEB_SERVICE)
AddJsonPackage(cpp-jwt) AddJsonPackage(cpp-jwt)
endif() endif()
# unordered_dense
AddJsonPackage(unordered-dense)
# FFMpeg # FFMpeg
if (YUZU_USE_BUNDLED_FFMPEG) if (YUZU_USE_BUNDLED_FFMPEG)
add_subdirectory(ffmpeg) add_subdirectory(ffmpeg)

13
externals/cpmfile.json vendored
View file

@ -105,5 +105,18 @@
"sha": "2bc873e53c", "sha": "2bc873e53c",
"hash": "02329058a7f9cf7d5039afaae5ab170d9f42f60f4c01e21eaf4f46073886922b057a9ae30eeac040b3ac182f51b9c1bfe9fe1050a2c9f6ce567a1a9a0ec2c768", "hash": "02329058a7f9cf7d5039afaae5ab170d9f42f60f4c01e21eaf4f46073886922b057a9ae30eeac040b3ac182f51b9c1bfe9fe1050a2c9f6ce567a1a9a0ec2c768",
"bundled": true "bundled": true
},
"unordered-dense": {
"package": "unordered_dense",
"repo": "martinus/unordered_dense",
"sha": "73f3cbb237",
"hash": "c08c03063938339d61392b687562909c1a92615b6ef39ec8df19ea472aa6b6478e70d7d5e33d4a27b5d23f7806daf57fe1bacb8124c8a945c918c7663a9e8532",
"find_args": "CONFIG",
"options": [
"UNORDERED_DENSE_INSTALL OFF"
],
"patches": [
"0001-cmake.patch"
]
} }
} }

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

@ -62,10 +62,10 @@ AddJsonPackage(
# unordered_dense # unordered_dense
AddJsonPackage( # AddJsonPackage(
NAME unordered-dense # NAME unordered-dense
BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS} # BUNDLED_PACKAGE ${DYNARMIC_USE_BUNDLED_EXTERNALS}
) # )
# xbyak # xbyak
# uncomment if in an independent repo # uncomment if in an independent repo

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

@ -33,18 +33,5 @@
"ZYDIS_BUILD_DOXYGEN OFF", "ZYDIS_BUILD_DOXYGEN OFF",
"ZYAN_SYSTEM_ZYCORE ON" "ZYAN_SYSTEM_ZYCORE ON"
] ]
},
"unordered-dense": {
"package": "unordered_dense",
"repo": "martinus/unordered_dense",
"sha": "73f3cbb237",
"hash": "c08c03063938339d61392b687562909c1a92615b6ef39ec8df19ea472aa6b6478e70d7d5e33d4a27b5d23f7806daf57fe1bacb8124c8a945c918c7663a9e8532",
"find_args": "CONFIG",
"options": [
"UNORDERED_DENSE_INSTALL OFF"
],
"patches": [
"0001-cmake.patch"
]
} }
} }