diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 05d9fb039c..7f6dfb892b 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -169,7 +169,7 @@ android { arguments( "-DENABLE_QT=0", // Don't use QT "-DENABLE_SDL2=0", // Don't use SDL - "-DENABLE_WEB_SERVICE=1", // Enable web service + "-DENABLE_WEB_SERVICE=ON", // Enable web service "-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work "-DYUZU_USE_BUNDLED_VCPKG=ON", "-DYUZU_USE_BUNDLED_FFMPEG=ON", diff --git a/src/common/android/multiplayer/multiplayer.cpp b/src/common/android/multiplayer/multiplayer.cpp index 26bb800ce2..ff57eedec3 100644 --- a/src/common/android/multiplayer/multiplayer.cpp +++ b/src/common/android/multiplayer/multiplayer.cpp @@ -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(port), 0, Network::NoPreferredIP, password, token); @@ -432,12 +432,12 @@ std::vector AndroidMultiplayer::NetPlayGetBanList() { std::unique_ptr AndroidMultiplayer::CreateVerifyBackend(bool use_validation) { std::unique_ptr verify_backend; if (use_validation) { -//#ifdef ENABLE_WEB_SERVICE +#ifdef ENABLE_WEB_SERVICE verify_backend = std::make_unique(Settings::values.web_api_url.GetValue()); -//#else -// verify_backend = std::make_unique(); -//#endif +#else + verify_backend = std::make_unique(); +#endif } else { verify_backend = std::make_unique(); } diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f0090a36b9..05a52526bc 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1192,8 +1192,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) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 897fd228f2..910472b1ac 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1821,7 +1821,7 @@ void GMainWindow::HandleSigInterrupt(int sig) { (void)ret; } -void GMainWindow::OnSigInterruptNotifierActivated() { +void GMainWindow::OnSigInterruptNotifierActivated(QSocketDescriptor _, QSocketNotifier::Type _) { sig_interrupt_notifier->setEnabled(false); char a; diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 9021c26005..a568b57554 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h @@ -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