diff options
author | David Marcec <dmarcecguzman@gmail.com> | 2020-06-19 14:17:56 +0200 |
---|---|---|
committer | David Marcec <dmarcecguzman@gmail.com> | 2020-06-19 14:17:56 +0200 |
commit | c7ed7d94279082600eb75218ebe8b4cc6a3ab0d0 (patch) | |
tree | 318c157fe64cca488593415f62178194ba211965 /src | |
parent | Merge pull request #4080 from ogniK5377/audren-RendererInfo (diff) | |
download | yuzu-c7ed7d94279082600eb75218ebe8b4cc6a3ab0d0.tar yuzu-c7ed7d94279082600eb75218ebe8b4cc6a3ab0d0.tar.gz yuzu-c7ed7d94279082600eb75218ebe8b4cc6a3ab0d0.tar.bz2 yuzu-c7ed7d94279082600eb75218ebe8b4cc6a3ab0d0.tar.lz yuzu-c7ed7d94279082600eb75218ebe8b4cc6a3ab0d0.tar.xz yuzu-c7ed7d94279082600eb75218ebe8b4cc6a3ab0d0.tar.zst yuzu-c7ed7d94279082600eb75218ebe8b4cc6a3ab0d0.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_service.cpp | 5 |
2 files changed, 7 insertions, 2 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..92a1737b3 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); @@ -106,6 +107,10 @@ std::pair<QString, QString> ConfigureService::BCATDownloadEvents() { .arg(FormatEventStatusString(value)); } return {QStringLiteral("Current Boxcat Events"), std::move(out)}; +#else + return {QStringLiteral("Current Boxcat Events"), + tr("There are currently no events on boxcat.")}; +#endif } void ConfigureService::OnBCATImplChanged() { |