From 2e02efbdd047ce125c7d0af418619f4e120df798 Mon Sep 17 00:00:00 2001 From: GPUCode Date: Fri, 17 Nov 2023 22:06:37 +0200 Subject: externals: Add oaknut submodule --- externals/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'externals/CMakeLists.txt') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 515e3f2a4..1d2be1459 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -26,6 +26,10 @@ if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmi add_library(dynarmic::dynarmic ALIAS dynarmic) endif() +if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut) + add_subdirectory(oaknut) +endif() + # getopt if (MSVC) add_subdirectory(getopt) -- cgit v1.2.3 From 9f91ba1f7357c61dd2c7c3b437ea203d467fd400 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 17 Nov 2023 23:44:53 +0200 Subject: arm: Implement native code execution backend --- externals/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'externals/CMakeLists.txt') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 1d2be1459..8f83d4991 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -20,16 +20,16 @@ if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) endif() # Dynarmic +if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut) + add_subdirectory(oaknut) +endif() + if ((ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) AND NOT TARGET dynarmic::dynarmic) set(DYNARMIC_IGNORE_ASSERTS ON) add_subdirectory(dynarmic) add_library(dynarmic::dynarmic ALIAS dynarmic) endif() -if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut) - add_subdirectory(oaknut) -endif() - # getopt if (MSVC) add_subdirectory(getopt) -- cgit v1.2.3