diff options
| author | 2018-01-19 19:36:09 -0500 | |
|---|---|---|
| committer | 2018-01-19 19:36:09 -0500 | |
| commit | c8a094e164b77fdae6b4b8bff7f94b703c24c161 (patch) | |
| tree | 7f1f70cec7f189c022b9ed5dc03c4996d21e54ca /src/core/CMakeLists.txt | |
| parent | Added CreateSharedMemory & UNIMPLEMENTED() for non existent services. (#113) (diff) | |
| download | yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar.gz yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.tar.xz yuzu-c8a094e164b77fdae6b4b8bff7f94b703c24c161.zip | |
Port citra #3352 to yuzu (#103)
* Port citra #3352 to yuzu
This change allows non x86_64 architectures to compile yuzu by skipping the building of dynarmic
* Fixed clang-format errors
* fixes more clang-format errors
Diffstat (limited to 'src/core/CMakeLists.txt')
| -rw-r--r-- | src/core/CMakeLists.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 8836ddf63..540d290f2 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | add_library(core STATIC | 1 | add_library(core STATIC |
| 2 | arm/arm_interface.h | 2 | arm/arm_interface.h |
| 3 | arm/dynarmic/arm_dynarmic.cpp | ||
| 4 | arm/dynarmic/arm_dynarmic.h | ||
| 5 | arm/unicorn/arm_unicorn.cpp | 3 | arm/unicorn/arm_unicorn.cpp |
| 6 | arm/unicorn/arm_unicorn.h | 4 | arm/unicorn/arm_unicorn.h |
| 7 | core.cpp | 5 | core.cpp |
| @@ -178,5 +176,13 @@ add_library(core STATIC | |||
| 178 | 176 | ||
| 179 | create_target_directory_groups(core) | 177 | create_target_directory_groups(core) |
| 180 | 178 | ||
| 181 | target_link_libraries(core PUBLIC common PRIVATE dynarmic video_core) | 179 | target_link_libraries(core PUBLIC common PRIVATE video_core) |
| 182 | target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static unicorn) | 180 | target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static unicorn) |
| 181 | |||
| 182 | if (ARCHITECTURE_x86_64) | ||
| 183 | target_sources(core PRIVATE | ||
| 184 | arm/dynarmic/arm_dynarmic.cpp | ||
| 185 | arm/dynarmic/arm_dynarmic.h | ||
| 186 | ) | ||
| 187 | target_link_libraries(core PRIVATE dynarmic) | ||
| 188 | endif() | ||