citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #2833 from j-selby/single-header-json 

Don't pull in entire JSON repo for single header file
This commit is contained in:
bunnei 2017-07-18 13:26:57 -04:00 committed by GitHub
parent 35eee446c7 32745ead7e
commit 5621a65037
5 changed files with 14524 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -31,6 +31,3 @@
[submodule "cpr"] [submodule "cpr"]
path = externals/cpr path = externals/cpr
url = https://github.com/whoshuu/cpr.git url = https://github.com/whoshuu/cpr.git
[submodule "json"]
path = externals/json
url = https://github.com/nlohmann/json.git

2
externals/CMakeLists.txt vendored
View File

@ -62,5 +62,5 @@ if (ENABLE_WEB_SERVICE)
# JSON # JSON
add_library(json-headers INTERFACE) add_library(json-headers INTERFACE)
target_include_directories(json-headers INTERFACE ./json/src) target_include_directories(json-headers INTERFACE ./json)
endif() endif()

1
externals/json vendored

@ -1 +0,0 @@
Subproject commit d3496347fcd1382896fca3aaf78a0d803c2f52ec

7
externals/json/README.md vendored Normal file
View File

@ -0,0 +1,7 @@
JSON for Modern C++
===================
This is a mirror providing the single required header file.
The original repository can be found at
https://github.com/nlohmann/json/commit/21d23982cafe826cae088b2bb37cb40c8e7a81fe

14516
externals/json/json.hpp vendored Normal file
View File

File diff suppressed because it is too large Load Diff