eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[compat] fix solaris Qt build #194

Merged
crueter merged 6 commits from solariscompat22 into master 2025-08-15 04:12:45 +02:00
Conversation 3 Commits 6 Files changed 21 +13 -13
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 35a0197037 - Show all commits

18
src/common/android/multiplayer/multiplayer.cpp
View file

@ -205,8 +205,8 @@ NetPlayStatus AndroidMultiplayer::NetPlayCreateRoom(const std::string &ipaddress
std::string token;
// TODO(alekpop): properly handle the compile definition, it's not working right
//#ifdef ENABLE_WEB_SERVICE
// LOG_INFO(WebService, "Web Service enabled");
#ifdef ENABLE_WEB_SERVICE
LOG_INFO(WebService, "Web Service enabled");
if (isPublic) {
WebService::Client client(Settings::values.web_api_url.GetValue(),
Settings::values.eden_username.GetValue(),
@ -220,9 +220,9 @@ NetPlayStatus AndroidMultiplayer::NetPlayCreateRoom(const std::string &ipaddress
LOG_INFO(WebService, "Successfully requested external JWT: size={}", token.size());
}
}
//#else
// LOG_INFO(WebService, "Web Service disabled");
//#endif
#else
LOG_ERROR(WebService, "Web Service disabled");
#endif
member->Join(username, ipaddress.c_str(), static_cast<u16>(port), 0, Network::NoPreferredIP,
password, token);
@ -432,12 +432,12 @@ std::vector<std::string> AndroidMultiplayer::NetPlayGetBanList() {
std::unique_ptr<Network::VerifyUser::Backend> AndroidMultiplayer::CreateVerifyBackend(bool use_validation) {
std::unique_ptr<Network::VerifyUser::Backend> verify_backend;
if (use_validation) {
//#ifdef ENABLE_WEB_SERVICE
#ifdef ENABLE_WEB_SERVICE
verify_backend =
std::make_unique<WebService::VerifyUserJWT>(Settings::values.web_api_url.GetValue());
//#else
// verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
//#endif
#else
verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
#endif
} else {
verify_backend = std::make_unique<Network::VerifyUser::NullBackend>();
}

4
src/core/CMakeLists.txt
View file

@ -1199,8 +1199,8 @@ if (MINGW)
endif()
if (ENABLE_WEB_SERVICE)
target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE)
target_link_libraries(core PRIVATE web_service)
target_compile_definitions(core PUBLIC -DENABLE_WEB_SERVICE)
target_link_libraries(core PUBLIC web_service)
endif()
if (HAS_NCE)

2
src/yuzu/main.cpp
View file

@ -1908,7 +1908,7 @@ void GMainWindow::HandleSigInterrupt(int sig) {
(void)ret;
}
void GMainWindow::OnSigInterruptNotifierActivated() {
void GMainWindow::OnSigInterruptNotifierActivated(QSocketDescriptor _, QSocketNotifier::Type _) {
sig_interrupt_notifier->setEnabled(false);
char a;

2
src/yuzu/main.h
View file

@ -326,7 +326,7 @@ private:
#ifdef __unix__
void SetupSigInterrupts();
static void HandleSigInterrupt(int);
void OnSigInterruptNotifierActivated();
void OnSigInterruptNotifierActivated(QSocketDescriptor socket, QSocketNotifier::Type type);
void SetGamemodeEnabled(bool state);
#endif