From 6ba83db6dd3a67aa8a1386251c8a55c9e580703c Mon Sep 17 00:00:00 2001 From: GPUCode Date: Sat, 11 Feb 2023 17:28:52 +0200 Subject: [PATCH] externals: Switch back to upstream dynarmic * Thanks mary for the quickfix --- .gitmodules | 4 ++-- externals/CMakeLists.txt | 1 - externals/dynarmic | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index a4a76da50..a1d0af096 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,7 @@ url = https://github.com/catchorg/Catch2 [submodule "dynarmic"] path = externals/dynarmic - url = https://github.com/GPUCode/dynarmic.git + url = https://github.com/merryhime/dynarmic.git [submodule "xbyak"] path = externals/xbyak url = https://github.com/herumi/xbyak.git @@ -72,4 +72,4 @@ url = https://github.com/g-truc/glm [submodule "sirit"] path = externals/sirit - url = https://github.com/GPUCode/sirit \ No newline at end of file + url = https://github.com/GPUCode/sirit diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 38b57134f..8ccb0e572 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -62,7 +62,6 @@ endif() # Dynarmic if ("x86_64" IN_LIST ARCHITECTURE OR "arm64" IN_LIST ARCHITECTURE) set(DYNARMIC_TESTS OFF) - set(DYNARMIC_NO_BUNDLED_FMT ON) set(DYNARMIC_FRONTENDS "A32") add_subdirectory(dynarmic) endif() diff --git a/externals/dynarmic b/externals/dynarmic index 7d51269f5..a179e2f2b 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit 7d51269f59c662add7c7c580c025f4dce7592664 +Subproject commit a179e2f2bb74e386c353ee2f6af3302e75075c3c