diff options
| author | bunnei <bunneidev@gmail.com> | 2020-06-20 03:59:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 03:59:59 +0200 |
| commit | 9c5ed4408d86e13cfdf9687a4a36c9fa68c7a7ac (patch) | |
| tree | abf3b92e01947cb80c9cf50ba15ee1a434c097ea /src | |
| parent | Merge pull request #4087 from MerryMage/macrojit-inline-Read (diff) | |
| parent | Add translation of "Current Boxcat Events" (diff) | |
| download | yuzu-9c5ed4408d86e13cfdf9687a4a36c9fa68c7a7ac.tar yuzu-9c5ed4408d86e13cfdf9687a4a36c9fa68c7a7ac.tar.gz yuzu-9c5ed4408d86e13cfdf9687a4a36c9fa68c7a7ac.tar.bz2 yuzu-9c5ed4408d86e13cfdf9687a4a36c9fa68c7a7ac.tar.lz yuzu-9c5ed4408d86e13cfdf9687a4a36c9fa68c7a7ac.tar.xz yuzu-9c5ed4408d86e13cfdf9687a4a36c9fa68c7a7ac.tar.zst yuzu-9c5ed4408d86e13cfdf9687a4a36c9fa68c7a7ac.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_service.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 47418006b..cb9ced5c9 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -606,11 +606,11 @@ endif() create_target_directory_groups(core) target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) -target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus unicorn) +target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls Opus::Opus unicorn zip) if (YUZU_ENABLE_BOXCAT) target_compile_definitions(core PRIVATE -DYUZU_ENABLE_BOXCAT) - target_link_libraries(core PRIVATE httplib nlohmann_json::nlohmann_json zip) + target_link_libraries(core PRIVATE httplib nlohmann_json::nlohmann_json) endif() if (ENABLE_WEB_SERVICE) diff --git a/src/yuzu/configuration/configure_service.cpp b/src/yuzu/configuration/configure_service.cpp index 06566e981..0de7a4f0b 100644 --- a/src/yuzu/configuration/configure_service.cpp +++ b/src/yuzu/configuration/configure_service.cpp @@ -68,6 +68,7 @@ void ConfigureService::SetConfiguration() { } std::pair<QString, QString> ConfigureService::BCATDownloadEvents() { +#ifdef YUZU_ENABLE_BOXCAT std::optional<std::string> global; std::map<std::string, Service::BCAT::EventStatus> map; const auto res = Service::BCAT::Boxcat::GetStatus(global, map); @@ -105,7 +106,10 @@ std::pair<QString, QString> ConfigureService::BCATDownloadEvents() { .arg(QString::fromStdString(key)) .arg(FormatEventStatusString(value)); } - return {QStringLiteral("Current Boxcat Events"), std::move(out)}; + return {tr("Current Boxcat Events"), std::move(out)}; +#else + return {tr("Current Boxcat Events"), tr("There are currently no events on boxcat.")}; +#endif } void ConfigureService::OnBCATImplChanged() { |