diff options
| author | 2016-09-01 23:00:15 -0400 | |
|---|---|---|
| committer | 2016-09-15 17:49:25 -0400 | |
| commit | 1ea1affe0a77775ff6defd3caa09ae34d64fd280 (patch) | |
| tree | bc159c52866e17b568b0d65f872e6f57f47fa3a6 | |
| parent | CMakeLists: Set Boost_INCLUDE_DIR. (diff) | |
| download | yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.tar.gz yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.tar.xz yuzu-1ea1affe0a77775ff6defd3caa09ae34d64fd280.zip | |
dynarmic: Add new submodule.
| -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 @@ | |||
| 1 | [submodule "inih"] | 1 | [submodule "inih"] |
| 2 | path = externals/inih/inih | 2 | path = externals/inih/inih |
| 3 | url = https://github.com/svn2github/inih | 3 | url = https://github.com/svn2github/inih |
| 4 | [submodule "boost"] | 4 | [submodule "boost"] |
| 5 | path = externals/boost | 5 | path = externals/boost |
| 6 | url = https://github.com/citra-emu/ext-boost.git | 6 | url = https://github.com/citra-emu/ext-boost.git |
| 7 | [submodule "nihstro"] | 7 | [submodule "nihstro"] |
| 8 | path = externals/nihstro | 8 | path = externals/nihstro |
| 9 | url = https://github.com/neobrain/nihstro.git | 9 | url = https://github.com/neobrain/nihstro.git |
| 10 | [submodule "soundtouch"] | 10 | [submodule "soundtouch"] |
| 11 | path = externals/soundtouch | 11 | path = externals/soundtouch |
| 12 | url = https://github.com/citra-emu/ext-soundtouch.git | 12 | url = https://github.com/citra-emu/ext-soundtouch.git |
| 13 | [submodule "catch"] | 13 | [submodule "catch"] |
| 14 | path = externals/catch | 14 | path = externals/catch |
| 15 | url = https://github.com/philsquared/Catch.git | 15 | url = https://github.com/philsquared/Catch.git |
| 16 | [submodule "dynarmic"] | ||
| 17 | path = externals/dynarmic | ||
| 18 | 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") | |||
| 226 | include_directories(${INI_PREFIX}) | 226 | include_directories(${INI_PREFIX}) |
| 227 | add_subdirectory(${INI_PREFIX}) | 227 | add_subdirectory(${INI_PREFIX}) |
| 228 | 228 | ||
| 229 | option(DYNARMIC_TESTS OFF) | ||
| 230 | add_subdirectory(externals/dynarmic) | ||
| 231 | |||
| 229 | add_subdirectory(externals/glad) | 232 | add_subdirectory(externals/glad) |
| 230 | include_directories(externals/microprofile) | 233 | include_directories(externals/microprofile) |
| 231 | include_directories(externals/nihstro/include) | 234 | include_directories(externals/nihstro/include) |
diff --git a/externals/dynarmic b/externals/dynarmic new file mode 160000 | |||
| Subproject 943487eceed82fbae016c333dc9fe33981e69aa | |||