diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index a351ff366..641884a3f 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -78,9 +78,9 @@ endif() if (ENABLE_WEB_SERVICE) # LibreSSL set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") - add_definitions(-DHAVE_INET_NTOP) add_subdirectory(libressl EXCLUDE_FROM_ALL) target_include_directories(ssl INTERFACE ./libressl/include) + target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP) # lurlparser add_subdirectory(lurlparser EXCLUDE_FROM_ALL) diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index d05fc6bbc..730809413 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -248,7 +248,7 @@ enable_telemetry = # URL for Web API web_api_url = https://api.citra-emu.org # Username and token for Citra Web Service -# See https://services.citra-emu.org/ for more info +# See https://profile.citra-emu.org/ for more info citra_username = citra_token = )"; diff --git a/src/citra_qt/configuration/configure_web.cpp b/src/citra_qt/configuration/configure_web.cpp index b0d45527c..d74a5bafa 100644 --- a/src/citra_qt/configuration/configure_web.cpp +++ b/src/citra_qt/configuration/configure_web.cpp @@ -38,7 +38,7 @@ void ConfigureWeb::setConfiguration() { ui->web_signup_link->setOpenExternalLinks(true); ui->web_signup_link->setText( - tr("Sign up")); ui->web_token_info_link->setOpenExternalLinks(true); ui->web_token_info_link->setText( diff --git a/src/web_service/json.h b/src/web_service/json.h deleted file mode 100644 index 88b31501e..000000000 --- a/src/web_service/json.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2018 Citra Emulator Project -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. - -#pragma once - -// This hack is needed to support json.hpp on platforms where the C++17 stdlib -// lacks std::string_view. See https://github.com/nlohmann/json/issues/735. -// clang-format off -#if !__has_include() && __has_include() -# include -# define string_view experimental::string_view -# include -# undef string_view -#else -# include -#endif -// clang-format on diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h index 4efef86a4..42a15b6a4 100644 --- a/src/web_service/telemetry_json.h +++ b/src/web_service/telemetry_json.h @@ -6,9 +6,9 @@ #include #include +#include #include "common/announce_multiplayer_room.h" #include "common/telemetry.h" -#include "web_service/json.h" namespace WebService { diff --git a/src/web_service/verify_login.cpp b/src/web_service/verify_login.cpp index 02e1b74f3..124aa3863 100644 --- a/src/web_service/verify_login.cpp +++ b/src/web_service/verify_login.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "web_service/json.h" +#include #include "web_service/verify_login.h" #include "web_service/web_backend.h"