Merge branch 'master' of github.com:citra-emu/citra into ips-patches

src/core/CMakeLists.txt

@@ -445,7 +445,8 @@ create_target_directory_groups(core)
 target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core)
 target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp fmt open_source_archives)
 if (ENABLE_WEB_SERVICE)
-    target_link_libraries(core PUBLIC json-headers web_service)
+    target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE)
+    target_link_libraries(core PRIVATE json-headers web_service)
 endif()
 
 if (ARCHITECTURE_x86_64)

src/core/telemetry_session.cpp

@@ -82,7 +82,7 @@ u64 RegenerateTelemetryId() {
     return new_telemetry_id;
 }
 
-bool VerifyLogin(std::string username, std::string token) {
+bool VerifyLogin(const std::string& username, const std::string& token) {
 #ifdef ENABLE_WEB_SERVICE
     return WebService::VerifyLogin(Settings::values.web_api_url, username, token);
 #else

src/core/telemetry_session.h

@@ -56,6 +56,6 @@ u64 RegenerateTelemetryId();
  * @param func A function that gets exectued when the verification is finished
  * @returns Future with bool indicating whether the verification succeeded
  */
-bool VerifyLogin(std::string username, std::string token);
+bool VerifyLogin(const std::string& username, const std::string& token);
 
 } // namespace Core