From 16df1f8078d694ed808074010ac9a9fd57478fb6 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Mon, 12 Dec 2016 22:16:54 -0800 Subject: externals: Update Dynarmic Required to be able to use Xbyak in Citra without header conflicts. --- externals/dynarmic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'externals') diff --git a/externals/dynarmic b/externals/dynarmic index 54d051977..34e19f135 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit 54d051977f7a6af9c7596ba6a4e6eb467bd1e0bc +Subproject commit 34e19f135c0dd2feac4f77660f51aa4ea28a7386 -- cgit v1.2.3 From 17fccb8c5d74dbf23d2f97ad86869a0feceb41c6 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 11 Dec 2016 14:59:28 -0800 Subject: Externals: Add Xbyak --- externals/CMakeLists.txt | 8 ++++++++ externals/xbyak | 1 + 2 files changed, 9 insertions(+) create mode 100644 externals/CMakeLists.txt create mode 160000 externals/xbyak (limited to 'externals') 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 index 000000000..fe4765d2f --- /dev/null +++ b/externals/xbyak @@ -0,0 +1 @@ +Subproject commit fe4765d2fed4e990ea5e9661b6bc5fc9bf48ec16 -- cgit v1.2.3