diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-12-11 23:59:28 +0100 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-12-15 05:06:08 +0100 |
| commit | 17fccb8c5d74dbf23d2f97ad86869a0feceb41c6 (patch) | |
| tree | 1a2fff7c01896a21d65edfaff688cc5eef7c057e | |
| parent | externals: Update Dynarmic (diff) | |
| download | yuzu-17fccb8c5d74dbf23d2f97ad86869a0feceb41c6.tar yuzu-17fccb8c5d74dbf23d2f97ad86869a0feceb41c6.tar.gz yuzu-17fccb8c5d74dbf23d2f97ad86869a0feceb41c6.tar.bz2 yuzu-17fccb8c5d74dbf23d2f97ad86869a0feceb41c6.tar.lz yuzu-17fccb8c5d74dbf23d2f97ad86869a0feceb41c6.tar.xz yuzu-17fccb8c5d74dbf23d2f97ad86869a0feceb41c6.tar.zst yuzu-17fccb8c5d74dbf23d2f97ad86869a0feceb41c6.zip | |
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 8 | ||||
| m--------- | externals/xbyak | 0 |
4 files changed, 13 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index f498a60de..dbb1b0dd3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "dynarmic"] path = externals/dynarmic url = https://github.com/MerryMage/dynarmic.git +[submodule "xbyak"] + path = externals/xbyak + url = https://github.com/herumi/xbyak.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c00690c0..bcee98a5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -256,6 +256,8 @@ set(INI_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/inih") include_directories(${INI_PREFIX}) add_subdirectory(${INI_PREFIX}) +add_subdirectory(externals) + option(DYNARMIC_TESTS OFF) add_subdirectory(externals/dynarmic) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt new file mode 100644 index 000000000..7e4b05ffc --- /dev/null +++ b/externals/CMakeLists.txt @@ -0,0 +1,8 @@ +# Xbyak +if (ARCHITECTURE_x86_64) + add_library(xbyak INTERFACE) + target_include_directories(xbyak INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak) + if (NOT MSVC) + target_compile_options(xbyak INTERFACE -fno-operator-names) + endif() +endif() diff --git a/externals/xbyak b/externals/xbyak new file mode 160000 +Subproject fe4765d2fed4e990ea5e9661b6bc5fc9bf48ec1 |