diff options
| author |  bunnei | 2017-07-12 21:31:12 -0400 |
|---|---|---|
| committer |  GitHub | 2017-07-12 21:31:12 -0400 |
| commit | 9cf261ba8ba4fd9929d275cc793d48d13df624f3 (patch) | |
| tree | 2eb47ab96bde081a84c5dd7c8107a21cb8a3511c /externals | |
| parent | Merge pull request #2815 from mailwl/bossp (diff) | |
| parent | web_backend: Specify api-version on JSON post. (diff) | |
| download | yuzu-9cf261ba8ba4fd9929d275cc793d48d13df624f3.tar.gz yuzu-9cf261ba8ba4fd9929d275cc793d48d13df624f3.tar.xz yuzu-9cf261ba8ba4fd9929d275cc793d48d13df624f3.zip | |
Merge pull request #2819 from bunnei/telemetry-submit
Telemetry: Submit logged data to the Citra service
Diffstat (limited to '')
| -rw-r--r-- | externals/CMakeLists.txt | 12 | ||||
| m--------- | externals/cpr | 0 | ||||
| m--------- | externals/json | 0 |
3 files changed, 12 insertions, 0 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index cc47166fc..ccc7f13b6 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -52,3 +52,15 @@ endif() | |||
| 52 | # ENet | 52 | # ENet |
| 53 | add_subdirectory(enet) | 53 | add_subdirectory(enet) |
| 54 | target_include_directories(enet INTERFACE ./enet/include) | 54 | target_include_directories(enet INTERFACE ./enet/include) |
| 55 | |||
| 56 | if (ENABLE_WEB_SERVICE) | ||
| 57 | # CPR | ||
| 58 | option(BUILD_TESTING OFF) | ||
| 59 | option(BUILD_CPR_TESTS OFF) | ||
| 60 | add_subdirectory(cpr) | ||
| 61 | target_include_directories(cpr INTERFACE ./cpr/include) | ||
| 62 | |||
| 63 | # JSON | ||
| 64 | add_library(json-headers INTERFACE) | ||
| 65 | target_include_directories(json-headers INTERFACE ./json/src) | ||
| 66 | endif() | ||
diff --git a/externals/cpr b/externals/cpr new file mode 160000 | |||
| Subproject b5758fbc88021437f968fe5174f121b8b92f5d5 | |||
diff --git a/externals/json b/externals/json new file mode 160000 | |||
| Subproject d3496347fcd1382896fca3aaf78a0d803c2f52e | |||