From 2e02efbdd047ce125c7d0af418619f4e120df798 Mon Sep 17 00:00:00 2001 From: GPUCode Date: Fri, 17 Nov 2023 22:06:37 +0200 Subject: [PATCH] externals: Add oaknut submodule --- .gitmodules | 3 +++ externals/CMakeLists.txt | 4 ++++ externals/oaknut | 1 + 3 files changed, 8 insertions(+) create mode 160000 externals/oaknut diff --git a/.gitmodules b/.gitmodules index 45dd0d259..e65997afc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,3 +61,6 @@ [submodule "simpleini"] path = externals/simpleini url = https://github.com/brofield/simpleini.git +[submodule "oaknut"] + path = externals/oaknut + url = https://github.com/merryhime/oaknut 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) diff --git a/externals/oaknut b/externals/oaknut new file mode 160000 index 000000000..918bd94f0 --- /dev/null +++ b/externals/oaknut @@ -0,0 +1 @@ +Subproject commit 918bd94f025d6a2de13978468351598997ae3909