diff options
| author | bunnei <bunneidev@gmail.com> | 2016-09-02 05:00:15 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-09-15 23:49:25 +0200 |
| commit | 1ea1affe0a77775ff6defd3caa09ae34d64fd280 (patch) | |
| tree | bc159c52866e17b568b0d65f872e6f57f47fa3a6 | |
| parent | CMakeLists: Set Boost_INCLUDE_DIR. (diff) | |
| download | yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.tar yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.tar.gz yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.tar.bz2 yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.tar.lz yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.tar.xz yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.tar.zst yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.zip | |
| -rw-r--r-- | .gitmodules | 23 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| m--------- | externals/dynarmic | 0 |
3 files changed, 16 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules index 1f0b80768..f498a60de 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,18 @@ [submodule "inih"] - path = externals/inih/inih - url = https://github.com/svn2github/inih + path = externals/inih/inih + url = https://github.com/svn2github/inih [submodule "boost"] - path = externals/boost - url = https://github.com/citra-emu/ext-boost.git + path = externals/boost + url = https://github.com/citra-emu/ext-boost.git [submodule "nihstro"] - path = externals/nihstro - url = https://github.com/neobrain/nihstro.git + path = externals/nihstro + url = https://github.com/neobrain/nihstro.git [submodule "soundtouch"] - path = externals/soundtouch - url = https://github.com/citra-emu/ext-soundtouch.git + path = externals/soundtouch + url = https://github.com/citra-emu/ext-soundtouch.git [submodule "catch"] - path = externals/catch - url = https://github.com/philsquared/Catch.git + path = externals/catch + url = https://github.com/philsquared/Catch.git +[submodule "dynarmic"] + path = externals/dynarmic + url = https://github.com/MerryMage/dynarmic.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3932fd569..c7a24f04f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -226,6 +226,9 @@ set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih") include_directories(${INI_PREFIX}) add_subdirectory(${INI_PREFIX}) +option(DYNARMIC_TESTS OFF) +add_subdirectory(externals/dynarmic) + add_subdirectory(externals/glad) include_directories(externals/microprofile) include_directories(externals/nihstro/include) diff --git a/externals/dynarmic b/externals/dynarmic new file mode 160000 +Subproject 943487eceed82fbae016c333dc9fe33981e69aa |