Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Deps]: Put json to a stable branch (#643)

Browse Source
This commit is contained in:
Edo 2022-12-15 15:59:52 +01:00 committed by GitHub
parent 34b92abd97
commit 817ca6e688
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -32,5 +32,6 @@
path = deps/GSL path = deps/GSL
url = https://github.com/microsoft/GSL.git url = https://github.com/microsoft/GSL.git
[submodule "deps/nlohmannjson"] [submodule "deps/nlohmannjson"]
path = deps/nlohmannjson path = deps/json
url = https://github.com/nlohmann/json.git url = https://github.com/nlohmann/json.git
branch = v3.11.2

1
deps/json vendored Submodule

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

1
deps/nlohmannjson vendored

@ -1 +0,0 @@
Subproject commit 7f72eedc2d4fc196d389f5aa0b2659f70dabe278

19
deps/premake/json.lua vendored Normal file
View File

@ -0,0 +1,19 @@
json = {
source = path.join(dependencies.basePath, "json"),
}
function json.import()
json.includes()
end
function json.includes()
includedirs {
path.join(json.source, "single_include/nlohmann")
}
end
function json.project()
end
table.insert(dependencies, json)

18
deps/premake/nlohmannjson.lua vendored
View File

@ -1,18 +0,0 @@
nlohmannjson = {
source = path.join(dependencies.basePath, "nlohmannjson"),
}
function nlohmannjson.import()
nlohmannjson.includes()
end
function nlohmannjson.includes()
includedirs {
path.join(nlohmannjson.source, "single_include/nlohmann")
}
end
function nlohmannjson.project()
end
table.insert(dependencies, nlohmannjson)