summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.gitmodules3
-rw-r--r--externals/CMakeLists.txt4
m---------externals/oaknut0
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 @@
61[submodule "simpleini"] 61[submodule "simpleini"]
62 path = externals/simpleini 62 path = externals/simpleini
63 url = https://github.com/brofield/simpleini.git 63 url = https://github.com/brofield/simpleini.git
64[submodule "oaknut"]
65 path = externals/oaknut
66 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
26 add_library(dynarmic::dynarmic ALIAS dynarmic) 26 add_library(dynarmic::dynarmic ALIAS dynarmic)
27endif() 27endif()
28 28
29if (ARCHITECTURE_arm64 AND NOT TARGET merry::oaknut)
30 add_subdirectory(oaknut)
31endif()
32
29# getopt 33# getopt
30if (MSVC) 34if (MSVC)
31 add_subdirectory(getopt) 35 add_subdirectory(getopt)
diff --git a/externals/oaknut b/externals/oaknut
new file mode 160000
Subproject 918bd94f025d6a2de13978468351598997ae390