dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-22 05:45:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Replace externals with Conan (#3735)

Browse source 
* 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
This commit is contained in:
James Rowe 2020-05-08 15:09:29 -06:00 • committed by GitHub
parent 4fb531a576
commit 2991e7441a
35 changed files with 579 additions and 17864 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/web_service/telemetry_json.cpp
View file

@ -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"