Browse Source
Merge pull request #4113 from ogniK5377/boxcat-disable
Fix compilation when not building with boxcat
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
7 additions and
3 deletions
-
src/core/CMakeLists.txt
-
src/yuzu/configuration/configure_service.cpp
|
|
|
@ -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) |
|
|
|
|
|
|
|
@ -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() { |
|
|
|
|