diff options
| author | 2020-10-19 12:40:49 -0700 | |
|---|---|---|
| committer | 2020-10-19 12:40:49 -0700 | |
| commit | 598ef6b0b3cec72f4467552d743ed512ea7113e1 (patch) | |
| tree | b06491dede00cea55f3164718b6450978fd34a91 /src | |
| parent | Merge pull request #4783 from bunnei/nvdrv-freespace (diff) | |
| parent | core: Add boxcat sources with target_sources (diff) | |
| download | yuzu-598ef6b0b3cec72f4467552d743ed512ea7113e1.tar.gz yuzu-598ef6b0b3cec72f4467552d743ed512ea7113e1.tar.xz yuzu-598ef6b0b3cec72f4467552d743ed512ea7113e1.zip | |
Merge pull request #4802 from lioncash/bcat
core: Add boxcat sources with target_sources
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 9760be4e4..b6dc25f6b 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | if (YUZU_ENABLE_BOXCAT) | ||
| 2 | set(BCAT_BOXCAT_ADDITIONAL_SOURCES hle/service/bcat/backend/boxcat.cpp hle/service/bcat/backend/boxcat.h) | ||
| 3 | else() | ||
| 4 | set(BCAT_BOXCAT_ADDITIONAL_SOURCES) | ||
| 5 | endif() | ||
| 6 | |||
| 7 | add_library(core STATIC | 1 | add_library(core STATIC |
| 8 | arm/arm_interface.h | 2 | arm/arm_interface.h |
| 9 | arm/arm_interface.cpp | 3 | arm/arm_interface.cpp |
| @@ -303,7 +297,6 @@ add_library(core STATIC | |||
| 303 | hle/service/audio/hwopus.h | 297 | hle/service/audio/hwopus.h |
| 304 | hle/service/bcat/backend/backend.cpp | 298 | hle/service/bcat/backend/backend.cpp |
| 305 | hle/service/bcat/backend/backend.h | 299 | hle/service/bcat/backend/backend.h |
| 306 | ${BCAT_BOXCAT_ADDITIONAL_SOURCES} | ||
| 307 | hle/service/bcat/bcat.cpp | 300 | hle/service/bcat/bcat.cpp |
| 308 | hle/service/bcat/bcat.h | 301 | hle/service/bcat/bcat.h |
| 309 | hle/service/bcat/module.cpp | 302 | hle/service/bcat/module.cpp |
| @@ -608,6 +601,13 @@ add_library(core STATIC | |||
| 608 | tools/freezer.h | 601 | tools/freezer.h |
| 609 | ) | 602 | ) |
| 610 | 603 | ||
| 604 | if (YUZU_ENABLE_BOXCAT) | ||
| 605 | target_sources(core PRIVATE | ||
| 606 | hle/service/bcat/backend/boxcat.cpp | ||
| 607 | hle/service/bcat/backend/boxcat.h | ||
| 608 | ) | ||
| 609 | endif() | ||
| 610 | |||
| 611 | if (MSVC) | 611 | if (MSVC) |
| 612 | target_compile_options(core PRIVATE | 612 | target_compile_options(core PRIVATE |
| 613 | # 'expression' : signed/unsigned mismatch | 613 | # 'expression' : signed/unsigned mismatch |