summaryrefslogtreecommitdiff
path: root/src/web_service/verify_login.cpp
diff options
context:
space:
mode:
authorGravatar James Rowe2020-05-08 15:09:29 -0600
committerGravatar GitHub2020-05-08 17:09:29 -0400
commitbc30a591ba7252e0c16d9c1b3c75a7073735bcae (patch)
tree2e88ab16d60c7df3e665bcf7c75c24683cb07189 /src/web_service/verify_login.cpp
parentMerge pull request #3885 from ReinUsesLisp/viewport-swizzles (diff)
downloadyuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.gz
yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.xz
yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.zip
Replace externals with Conan (#3735)
* Remove git submodules that will be loaded through conan * Move custom Find modules to their own folder * Use conan for downloading missing external dependencies * CI: Change the yuzu source folder user to the user that the containers run on * Attempt to remove dirty mingw build hack * Install conan on the msvc build * Only set release build type when using not using multi config generator * Re-add qt bundled to workaround an issue with conan qt not downloading prebuilt binaries * Add workaround for submodules that use legacy CMAKE variables * Re-add USE_BUNDLED_QT on the msvc build bot
Diffstat (limited to 'src/web_service/verify_login.cpp')
-rw-r--r--src/web_service/verify_login.cpp2
1 files changed, 1 insertions, 1 deletions
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 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <json.hpp> 5#include <nlohmann/json.hpp>
6#include "common/web_result.h" 6#include "common/web_result.h"
7#include "web_service/verify_login.h" 7#include "web_service/verify_login.h"
8#include "web_service/web_backend.h" 8#include "web_service/web_backend.h"