Review comments - part 3

7 files changed, 8 insertions, 26 deletions

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 6a573881d..1261062e8 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -80,9 +80,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/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(<string_view>) && __has_include(<experimental/string_view>)
-# include <experimental/string_view>
-# define string_view experimental::string_view
-# include <json.hpp>
-# undef string_view
-#else
-# include <json.hpp>
-#endif
-// clang-format on
diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h
index 29d565964..0fe6f9a3e 100644
--- a/src/web_service/telemetry_json.h
+++ b/src/web_service/telemetry_json.h
@@ -6,9 +6,9 @@
 
 #include <array>
 #include <string>
+#include <json.hpp>
 #include "common/telemetry.h"
 #include "common/web_result.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 <json.hpp>
 #include "web_service/verify_login.h"
 #include "web_service/web_backend.h"
 
diff --git a/src/yuzu/configuration/configure_web.cpp b/src/yuzu/configuration/configure_web.cpp
index 4b5c39e26..d6bd3d309 100644
--- a/src/yuzu/configuration/configure_web.cpp
+++ b/src/yuzu/configuration/configure_web.cpp
@@ -31,18 +31,18 @@ void ConfigureWeb::setConfiguration() {
     ui->web_credentials_disclaimer->setWordWrap(true);
     ui->telemetry_learn_more->setOpenExternalLinks(true);
     ui->telemetry_learn_more->setText(tr("<a "
-                                         "href='https://citra-emu.org/entry/"
+                                         "href='https://yuzu-emu.org/entry/"
                                          "telemetry-and-why-thats-a-good-thing/'><span "
                                          "style=\"text-decoration: underline; "
                                          "color:#039be5;\">Learn more</span></a>"));
 
     ui->web_signup_link->setOpenExternalLinks(true);
     ui->web_signup_link->setText(
-        tr("<a href='https://services.citra-emu.org/'><span style=\"text-decoration: underline; "
+        tr("<a href='https://profile.yuzu-emu.org/'><span style=\"text-decoration: underline; "
            "color:#039be5;\">Sign up</span></a>"));
     ui->web_token_info_link->setOpenExternalLinks(true);
     ui->web_token_info_link->setText(
-        tr("<a href='https://citra-emu.org/wiki/citra-web-service/'><span style=\"text-decoration: "
+        tr("<a href='https://yuzu-emu.org/wiki/yuzu-web-service/'><span style=\"text-decoration: "
            "underline; color:#039be5;\">What is my token?</span></a>"));
 
     ui->toggle_telemetry->setChecked(Settings::values.enable_telemetry);
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index f236c63c5..52743aefd 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -116,7 +116,7 @@ void GMainWindow::ShowTelemetryCallout() {
 
     UISettings::values.callout_flags |= static_cast<uint32_t>(CalloutFlag::Telemetry);
     const QString telemetry_message =
-        tr("<a href='https://citra-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous "
+        tr("<a href='https://yuzu-emu.org/entry/telemetry-and-why-thats-a-good-thing/'>Anonymous "
            "data is collected</a> to help improve yuzu. "
            "<br/><br/>Would you like to share your usage data with us?");
     if (QMessageBox::question(this, tr("Telemetry"), telemetry_message) != QMessageBox::Yes) {
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index eaa64da39..762396e3b 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -205,7 +205,7 @@ enable_telemetry =
 # URL for Web API
 web_api_url = https://api.yuzu-emu.org
 # Username and token for yuzu Web Service
-# See https://services.citra-emu.org/ for more info
+# See https://profile.yuzu-emu.org/ for more info
 yuzu_username =
 yuzu_token =
 )";