diff options
| author |  Yuri Kunde Schlesner | 2017-06-17 12:20:22 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2017-06-17 12:20:22 -0700 |
| commit | f6715f98f511afbe415e7411351159bbb1828343 (patch) | |
| tree | 1de848930ad3d6b0a05a5af242050f24b05eabc2 /externals | |
| parent | Merge pull request #2762 from wwylele/light-cp-tangent (diff) | |
| download | yuzu-f6715f98f511afbe415e7411351159bbb1828343.tar.gz yuzu-f6715f98f511afbe415e7411351159bbb1828343.tar.xz yuzu-f6715f98f511afbe415e7411351159bbb1828343.zip | |
Stop using reserved operator names (and/or/xor) with Xbyak
Also has the Dynarmic upgrade with the same change
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 4 | ||||
| m--------- | externals/dynarmic | 0 |
2 files changed, 1 insertions, 3 deletions
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) | |||
| 46 | # Defined before "dynarmic" above | 46 | # Defined before "dynarmic" above |
| 47 | # add_library(xbyak INTERFACE) | 47 | # add_library(xbyak INTERFACE) |
| 48 | target_include_directories(xbyak INTERFACE ./xbyak/xbyak) | 48 | target_include_directories(xbyak INTERFACE ./xbyak/xbyak) |
| 49 | if (NOT MSVC) | 49 | target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) |
| 50 | target_compile_options(xbyak INTERFACE -fno-operator-names) | ||
| 51 | endif() | ||
| 52 | endif() | 50 | endif() |
diff --git a/externals/dynarmic b/externals/dynarmic | |||
| Subproject 7707ff13e981b0aecf87f3156ee0b641469f7bb | Subproject 8f15e3f70cb96e56705e5de6ba97b5d09423a56 | ||