From 3bcd5f95fea9a2952aff5f3f0a4a637a18612a5d Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 27 Jul 2025 02:36:18 +0200 Subject: [PATCH] [git] fix dup xbyak (#140) Signed-off-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/140 --- .gitmodules | 3 --- externals/dynarmic/externals/CMakeLists.txt | 11 ++++++----- externals/dynarmic/externals/xbyak | 1 - 3 files changed, 6 insertions(+), 9 deletions(-) delete mode 160000 externals/dynarmic/externals/xbyak diff --git a/.gitmodules b/.gitmodules index 371b62a605..184fad49d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,9 +49,6 @@ [submodule "externals/dynarmic/externals/unordered_dense"] path = externals/dynarmic/externals/unordered_dense url = https://github.com/Lizzie841/unordered_dense.git -[submodule "externals/dynarmic/externals/xbyak"] - path = externals/dynarmic/externals/xbyak - url = https://github.com/Lizzie841/xbyak.git [submodule "externals/dynarmic/externals/zycore-c"] path = externals/dynarmic/externals/zycore-c url = https://github.com/zyantific/zycore-c.git diff --git a/externals/dynarmic/externals/CMakeLists.txt b/externals/dynarmic/externals/CMakeLists.txt index f96497db7a..67fb0f4190 100644 --- a/externals/dynarmic/externals/CMakeLists.txt +++ b/externals/dynarmic/externals/CMakeLists.txt @@ -64,12 +64,13 @@ if (NOT TARGET ankerl::unordered_dense) endif() # xbyak +# uncomment if in an independent repo. -if (NOT TARGET xbyak::xbyak) - if ("x86_64" IN_LIST ARCHITECTURE) - add_subdirectory(xbyak) - endif() -endif() +# if (NOT TARGET xbyak::xbyak) +# if ("x86_64" IN_LIST ARCHITECTURE) +# add_subdirectory(xbyak) +# endif() +# endif() # zydis diff --git a/externals/dynarmic/externals/xbyak b/externals/dynarmic/externals/xbyak deleted file mode 160000 index 12557954c6..0000000000 --- a/externals/dynarmic/externals/xbyak +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 12557954c68a780563f9ab9fc24a3a156c96cba1