diff options
| author | bunnei <bunneidev@gmail.com> | 2018-01-04 23:01:02 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-01-04 23:01:02 +0100 |
| commit | dcfbad212937f8f6ffc824bc24538df32f16a13b (patch) | |
| tree | 2968491e556b8c4007d8d92953ae6b7df63001c2 | |
| parent | core: Increase tight_loop 100x for speed. (diff) | |
| download | yuzu-dcfbad212937f8f6ffc824bc24538df32f16a13b.tar yuzu-dcfbad212937f8f6ffc824bc24538df32f16a13b.tar.gz yuzu-dcfbad212937f8f6ffc824bc24538df32f16a13b.tar.bz2 yuzu-dcfbad212937f8f6ffc824bc24538df32f16a13b.tar.lz yuzu-dcfbad212937f8f6ffc824bc24538df32f16a13b.tar.xz yuzu-dcfbad212937f8f6ffc824bc24538df32f16a13b.tar.zst yuzu-dcfbad212937f8f6ffc824bc24538df32f16a13b.zip | |
| -rw-r--r-- | externals/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 8f42f4fdc..aa01acda8 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -10,13 +10,6 @@ target_include_directories(catch-single-include INTERFACE catch/single_include) # Crypto++ add_subdirectory(cryptopp) -# Dynarmic -# Dynarmic will skip defining xbyak if it's already defined, we then define it below -add_library(xbyak INTERFACE) -option(DYNARMIC_TESTS OFF) -set(DYNARMIC_NO_BUNDLED_FMT ON) -add_subdirectory(dynarmic) - # libfmt add_subdirectory(fmt) @@ -56,7 +49,7 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include) # Xbyak if (ARCHITECTURE_x86_64) # Defined before "dynarmic" above - # add_library(xbyak INTERFACE) + add_library(xbyak INTERFACE) target_include_directories(xbyak INTERFACE ./xbyak/xbyak) target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) endif() diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f3ed33cfb..d35f974ca 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -158,7 +158,7 @@ set(HEADERS create_directory_groups(${SRCS} ${HEADERS}) add_library(core STATIC ${SRCS} ${HEADERS}) target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core) -target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp dynarmic fmt lz4_static unicorn) +target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp fmt lz4_static unicorn) if (ENABLE_WEB_SERVICE) target_link_libraries(core PUBLIC json-headers web_service) endif() |