summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-06-16 04:39:48 +0200
committerGitHub <noreply@github.com>2020-06-16 04:39:48 +0200
commited2cd9d8f3b9c82eb6013cf389c06ab783499d83 (patch)
treea91cb4b4bd938dae7fa304fd1e2770826a87f5a2
parentMerge pull request #4066 from ReinUsesLisp/shared-ptr-buf (diff)
parentCMakeLists: xbyak comes before dynarmic (diff)
downloadyuzu-ed2cd9d8f3b9c82eb6013cf389c06ab783499d83.tar
yuzu-ed2cd9d8f3b9c82eb6013cf389c06ab783499d83.tar.gz
yuzu-ed2cd9d8f3b9c82eb6013cf389c06ab783499d83.tar.bz2
yuzu-ed2cd9d8f3b9c82eb6013cf389c06ab783499d83.tar.lz
yuzu-ed2cd9d8f3b9c82eb6013cf389c06ab783499d83.tar.xz
yuzu-ed2cd9d8f3b9c82eb6013cf389c06ab783499d83.tar.zst
yuzu-ed2cd9d8f3b9c82eb6013cf389c06ab783499d83.zip
-rw-r--r--externals/CMakeLists.txt15
1 files changed, 7 insertions, 8 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index df7a5e0a9..9be5b2780 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -4,6 +4,13 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules")
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/externals/find-modules")
include(DownloadExternals)
+# xbyak
+if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
+ add_library(xbyak INTERFACE)
+ target_include_directories(xbyak SYSTEM INTERFACE ./xbyak/xbyak)
+ target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
+endif()
+
# Catch
add_library(catch-single-include INTERFACE)
target_include_directories(catch-single-include INTERFACE catch/single_include)
@@ -75,11 +82,3 @@ if (ENABLE_WEB_SERVICE)
target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
target_link_libraries(httplib INTERFACE OpenSSL::SSL OpenSSL::Crypto)
endif()
-
-if (NOT TARGET xbyak)
- if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
- add_library(xbyak INTERFACE)
- target_include_directories(xbyak SYSTEM INTERFACE ./xbyak/xbyak)
- target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
- endif()
-endif()