From f6715f98f511afbe415e7411351159bbb1828343 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 17 Jun 2017 12:20:22 -0700 Subject: Stop using reserved operator names (and/or/xor) with Xbyak Also has the Dynarmic upgrade with the same change --- externals/CMakeLists.txt | 4 +--- externals/dynarmic | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'externals') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 1e04931ee..02e02350c 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -46,7 +46,5 @@ if (ARCHITECTURE_x86_64) # Defined before "dynarmic" above # add_library(xbyak INTERFACE) target_include_directories(xbyak INTERFACE ./xbyak/xbyak) - if (NOT MSVC) - target_compile_options(xbyak INTERFACE -fno-operator-names) - endif() + target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) endif() diff --git a/externals/dynarmic b/externals/dynarmic index 7707ff13e..8f15e3f70 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit 7707ff13e981b0aecf87f3156ee0b641469f7bb3 +Subproject commit 8f15e3f70cb96e56705e5de6ba97b5d09423a56b -- cgit v1.2.3