diff options
| -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) | |||
| 10 | # Crypto++ | 10 | # Crypto++ |
| 11 | add_subdirectory(cryptopp) | 11 | add_subdirectory(cryptopp) |
| 12 | 12 | ||
| 13 | # Dynarmic | ||
| 14 | # Dynarmic will skip defining xbyak if it's already defined, we then define it below | ||
| 15 | add_library(xbyak INTERFACE) | ||
| 16 | option(DYNARMIC_TESTS OFF) | ||
| 17 | set(DYNARMIC_NO_BUNDLED_FMT ON) | ||
| 18 | add_subdirectory(dynarmic) | ||
| 19 | |||
| 20 | # libfmt | 13 | # libfmt |
| 21 | add_subdirectory(fmt) | 14 | add_subdirectory(fmt) |
| 22 | 15 | ||
| @@ -56,7 +49,7 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include) | |||
| 56 | # Xbyak | 49 | # Xbyak |
| 57 | if (ARCHITECTURE_x86_64) | 50 | if (ARCHITECTURE_x86_64) |
| 58 | # Defined before "dynarmic" above | 51 | # Defined before "dynarmic" above |
| 59 | # add_library(xbyak INTERFACE) | 52 | add_library(xbyak INTERFACE) |
| 60 | target_include_directories(xbyak INTERFACE ./xbyak/xbyak) | 53 | target_include_directories(xbyak INTERFACE ./xbyak/xbyak) |
| 61 | target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) | 54 | target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES) |
| 62 | endif() | 55 | 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 | |||
| 158 | create_directory_groups(${SRCS} ${HEADERS}) | 158 | create_directory_groups(${SRCS} ${HEADERS}) |
| 159 | add_library(core STATIC ${SRCS} ${HEADERS}) | 159 | add_library(core STATIC ${SRCS} ${HEADERS}) |
| 160 | target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core) | 160 | target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core) |
| 161 | target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp dynarmic fmt lz4_static unicorn) | 161 | target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp fmt lz4_static unicorn) |
| 162 | if (ENABLE_WEB_SERVICE) | 162 | if (ENABLE_WEB_SERVICE) |
| 163 | target_link_libraries(core PUBLIC json-headers web_service) | 163 | target_link_libraries(core PUBLIC json-headers web_service) |
| 164 | endif() | 164 | endif() |