Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[cmake] fix gh dependencies (#377)

lizzie6aa8be1da8af
diff --git a/.patch/unordered-dense/0001-cmake.patch b/.patch/unordered-dense/0001-cmake.patch
new file mode 100644
index 0000000000..39e7794b1f
--- /dev/null
+++ b/.patch/unordered-dense/0001-cmake.patch
@@ -0,0 +1,22 @@
+From e59d30b7b12e1d04cc2fc9c6219e35bda447c17e Mon Sep 17 00:00:00 2001
+From: Lizzie <[email protected]>
+Date: Fri, 16 May 2025 04:12:13 +0100
+Subject: [PATCH] Update CMakeLists.txt
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b5f4c4f..c5c6f31 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,7 @@ target_include_directories(
+
+ target_compile_features(unordered_dense INTERFACE cxx_std_17)
+
+-if(_unordered_dense_is_toplevel_project)
++if(_unordered_dense_is_toplevel_project OR UNORDERED_DENSE_INSTALL)
+ # locations are provided by GNUInstallDirs
+ install(
+ TARGETS unordered_dense
diff --git a/externals/cpmfile.json b/externals/cpmfile.json
index effcbcc01f..bbc6b056c1 100644
--- a/externals/cpmfile.json
+++ b/externals/cpmfile.json
@@ -74,14 +74,14 @@
},
"xbyak_sun": {
"package": "xbyak",
- "repo": "Lizzie841/xbyak",
- "sha": "51f507b0b3",
- "hash": "4a29a3c2f97f7d5adf667a21a008be03c951fb6696b0d7ba27e7e4afa037bc76eb5e059bb84860e01baf741d4d3ac851b840cd54c99d038812fbe0f1fa6d38a4",
+ "repo": "herumi/xbyak",
+ "sha": "9bb219333a",
+ "hash": "303165d45c8c19387ec49d9fda7d7a4e0d86d4c0153898c23f25ce2d58ece567f44c0bbbfe348239b933edb6e1a1e34f4bc1c0ab3a285bee5da0e548879387b0",
"bundled": true
},
"xbyak": {
"package": "xbyak",
- "repo": "Lizzie841/xbyak",
+ "repo": "herumi/xbyak",
"sha": "4e44f4614d",
"hash": "5824e92159e07fa36a774aedd3b3ef3541d0241371d522cffa4ab3e1f215fa5097b1b77865b47b2481376c704fa079875557ea463ca63d0a7fd6a8a20a589e70",
"bundled": true
diff --git a/src/dynarmic/externals/cpmfile.json b/src/dynarmic/externals/cpmfile.json
index b934856af2..cebcdf5232 100644
--- a/src/dynarmic/externals/cpmfile.json
+++ b/src/dynarmic/externals/cpmfile.json
@@ -16,12 +16,15 @@
},
"unordered-dense": {
"package": "unordered_dense",
- "repo": "Lizzie841/unordered_dense",
+ "repo": "martinus/unordered_dense",
"sha": "e59d30b7b1",
"hash": "71eff7bd9ba4b9226967bacd56a8ff000946f8813167cb5664bb01e96fb79e4e220684d824fe9c59c4d1cc98c606f13aff05b7940a1ed8ab3c95d6974ee34fa0",
"find_args": "CONFIG",
"options": [
"UNORDERED_DENSE_INSTALL OFF"
+ ],
+ "patches": [
+ "0001-cmake.patch"
]
},
"zycore": {