hugopeixoto/yuzu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation when not building with boxcat

Browse Source 
Fixes compilation when trying to build without boxcat enabled
This commit is contained in:
David Marcec 2020-06-19 22:17:56 +10:00
parent 0f7822acb1
commit c7ed7d9427
2 changed files with 7 additions and 2 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)

5
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);
@ -106,6 +107,10 @@ std::pair<QString, QString> ConfigureService::BCATDownloadEvents() {
.arg(FormatEventStatusString(value)); .arg(FormatEventStatusString(value));
} }
return {QStringLiteral("Current Boxcat Events"), std::move(out)}; 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() { void ConfigureService::OnBCATImplChanged() {