artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4113 from ogniK5377/boxcat-disable

Browse source 
Fix compilation when not building with boxcat
This commit is contained in:
bunnei 2020-06-19 21:59:59 -04:00 committed by GitHub
parent 7daea551c0 a7fe6dc232
commit 9c5ed4408d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/CMakeLists.txt
View file

@ -606,11 +606,11 @@ endif()
create_target_directory_groups(core) create_target_directory_groups(core)
target_link_libraries(core PUBLIC common PRIVATE audio_core video_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) if (YUZU_ENABLE_BOXCAT)
target_compile_definitions(core PRIVATE -DYUZU_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() endif()
if (ENABLE_WEB_SERVICE) if (ENABLE_WEB_SERVICE)

6
src/yuzu/configuration/configure_service.cpp
View file

@ -68,6 +68,7 @@ void ConfigureService::SetConfiguration() {
} }
std::pair<QString, QString> ConfigureService::BCATDownloadEvents() { std::pair<QString, QString> ConfigureService::BCATDownloadEvents() {
#ifdef YUZU_ENABLE_BOXCAT
std::optional<std::string> global; std::optional<std::string> global;
std::map<std::string, Service::BCAT::EventStatus> map; std::map<std::string, Service::BCAT::EventStatus> map;
const auto res = Service::BCAT::Boxcat::GetStatus(global, 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(QString::fromStdString(key))
.arg(FormatEventStatusString(value)); .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() { void ConfigureService::OnBCATImplChanged() {