mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-04-19 15:52:53 +00:00
Add nlohmann json submodule third party dependency
This commit is contained in:
parent
2ec65924c6
commit
0f47e64486
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -10,3 +10,6 @@
|
|||||||
[submodule "thirdparty/catch2"]
|
[submodule "thirdparty/catch2"]
|
||||||
path = thirdparty/catch2
|
path = thirdparty/catch2
|
||||||
url = https://github.com/catchorg/Catch2.git
|
url = https://github.com/catchorg/Catch2.git
|
||||||
|
[submodule "thirdparty/json"]
|
||||||
|
path = thirdparty/json
|
||||||
|
url = https://github.com/nlohmann/json.git
|
||||||
|
@ -75,6 +75,7 @@ workspace "OpenAssetTools"
|
|||||||
include "thirdparty/catch2.lua"
|
include "thirdparty/catch2.lua"
|
||||||
include "thirdparty/libtomcrypt.lua"
|
include "thirdparty/libtomcrypt.lua"
|
||||||
include "thirdparty/libtommath.lua"
|
include "thirdparty/libtommath.lua"
|
||||||
|
include "thirdparty/json.lua"
|
||||||
include "thirdparty/minilzo.lua"
|
include "thirdparty/minilzo.lua"
|
||||||
include "thirdparty/minizip.lua"
|
include "thirdparty/minizip.lua"
|
||||||
include "thirdparty/salsa20.lua"
|
include "thirdparty/salsa20.lua"
|
||||||
@ -85,6 +86,7 @@ group "ThirdParty"
|
|||||||
catch2:project()
|
catch2:project()
|
||||||
libtommath:project()
|
libtommath:project()
|
||||||
libtomcrypt:project()
|
libtomcrypt:project()
|
||||||
|
json:project()
|
||||||
minilzo:project()
|
minilzo:project()
|
||||||
minizip:project()
|
minizip:project()
|
||||||
salsa20:project()
|
salsa20:project()
|
||||||
|
@ -52,6 +52,7 @@ function ObjWriting:project()
|
|||||||
|
|
||||||
self:include(includes)
|
self:include(includes)
|
||||||
Utils:include(includes)
|
Utils:include(includes)
|
||||||
|
json:include(includes)
|
||||||
minilzo:include(includes)
|
minilzo:include(includes)
|
||||||
minizip:include(includes)
|
minizip:include(includes)
|
||||||
end
|
end
|
||||||
|
1
thirdparty/json
vendored
Submodule
1
thirdparty/json
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 4f8fba14066156b73f1189a2b8bd568bde5284c5
|
23
thirdparty/json.lua
vendored
Normal file
23
thirdparty/json.lua
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
json = {}
|
||||||
|
|
||||||
|
function json:include(includes)
|
||||||
|
if includes:handle(self:name()) then
|
||||||
|
includedirs {
|
||||||
|
path.join(ThirdPartyFolder(), "json", "single_include")
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function json:link()
|
||||||
|
end
|
||||||
|
|
||||||
|
function json:use()
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
function json:name()
|
||||||
|
return "json"
|
||||||
|
end
|
||||||
|
|
||||||
|
function json:project()
|
||||||
|
end
|
Loading…
x
Reference in New Issue
Block a user