diff options
| author | GPUCode <geoster3d@gmail.com> | 2023-11-17 21:06:37 +0100 |
|---|---|---|
| committer | t895 <clombardo169@gmail.com> | 2023-11-25 06:46:47 +0100 |
| commit | 2e02efbdd047ce125c7d0af418619f4e120df798 (patch) | |
| tree | 658198afff6d72ccc7dd14f09bc86600055df8b1 | |
| parent | settings: Add cpu backend setting (diff) | |
| download | yuzu-2e02efbdd047ce125c7d0af418619f4e120df798.tar yuzu-2e02efbdd047ce125c7d0af418619f4e120df798.tar.gz yuzu-2e02efbdd047ce125c7d0af418619f4e120df798.tar.bz2 yuzu-2e02efbdd047ce125c7d0af418619f4e120df798.tar.lz yuzu-2e02efbdd047ce125c7d0af418619f4e120df798.tar.xz yuzu-2e02efbdd047ce125c7d0af418619f4e120df798.tar.zst yuzu-2e02efbdd047ce125c7d0af418619f4e120df798.zip | |
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 4 | ||||
| m--------- | externals/oaknut | 0 |
3 files changed, 7 insertions, 0 deletions
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 +Subproject 918bd94f025d6a2de13978468351598997ae390 |