diff options
| author | James Rowe <jroweboy@gmail.com> | 2020-05-08 23:09:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 23:09:29 +0200 |
| commit | bc30a591ba7252e0c16d9c1b3c75a7073735bcae (patch) | |
| tree | 2e88ab16d60c7df3e665bcf7c75c24683cb07189 /src/web_service | |
| parent | Merge pull request #3885 from ReinUsesLisp/viewport-swizzles (diff) | |
| download | yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.gz yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.bz2 yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.lz yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.xz yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.zst yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.zip | |
Diffstat (limited to 'src/web_service')
| -rw-r--r-- | src/web_service/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/web_service/telemetry_json.cpp | 2 | ||||
| -rw-r--r-- | src/web_service/verify_login.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt index 0c9bb0d55..06ab7c59d 100644 --- a/src/web_service/CMakeLists.txt +++ b/src/web_service/CMakeLists.txt @@ -8,4 +8,4 @@ add_library(web_service STATIC ) create_target_directory_groups(web_service) -target_link_libraries(web_service PRIVATE common json-headers httplib lurlparser) +target_link_libraries(web_service PRIVATE common nlohmann_json::nlohmann_json httplib lurlparser) diff --git a/src/web_service/telemetry_json.cpp b/src/web_service/telemetry_json.cpp index 7538389bf..7a480e33c 100644 --- a/src/web_service/telemetry_json.cpp +++ b/src/web_service/telemetry_json.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include <json.hpp> +#include <nlohmann/json.hpp> #include "common/detached_tasks.h" #include "common/web_result.h" #include "web_service/telemetry_json.h" diff --git a/src/web_service/verify_login.cpp b/src/web_service/verify_login.cpp index ca4b43b93..bfaa5b70a 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 <json.hpp> +#include <nlohmann/json.hpp> #include "common/web_result.h" #include "web_service/verify_login.h" #include "web_service/web_backend.h" |