Skip to content

Commit fed427b

Browse files
committed
Replace json submodule by a lighter one
1 parent 0240743 commit fed427b

4 files changed

Lines changed: 18 additions & 18 deletions

File tree

.gitmodules

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
[submodule "lib/zstd"]
2-
path = lib/zstd
3-
url = https://github.com/facebook/zstd.git
4-
[submodule "lib/sqfvm"]
5-
path = lib/sqfvm
6-
url = https://github.com/SQFvm/vm.git
7-
[submodule "lib/cpp-base64"]
8-
path = lib/cpp-base64
9-
url = https://github.com/dedmen/cpp-base64.git
10-
[submodule "lib/lzokay"]
11-
path = lib/lzokay
12-
url = https://github.com/jackoalan/lzokay.git
13-
[submodule "lib/json"]
14-
path = lib/json
15-
url = https://github.com/nlohmann/json.git
1+
[submodule "lib/zstd"]
2+
path = lib/zstd
3+
url = https://github.com/facebook/zstd.git
4+
[submodule "lib/sqfvm"]
5+
path = lib/sqfvm
6+
url = https://github.com/SQFvm/vm.git
7+
[submodule "lib/cpp-base64"]
8+
path = lib/cpp-base64
9+
url = https://github.com/dedmen/cpp-base64.git
10+
[submodule "lib/lzokay"]
11+
path = lib/lzokay
12+
url = https://github.com/jackoalan/lzokay.git
13+
[submodule "lib/json"]
14+
path = lib/json
15+
url = https://github.com/azadkuh/nlohmann_json_release.git
1616
[submodule "lib/sol2"]
1717
path = lib/sol2
1818
url = https://github.com/ThePhD/sol2.git

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ set(LIBRARY_PATH_ZSTD "${CMAKE_SOURCE_DIR}/lib/zstd")
3232
set(LIBRARY_PATH_SQFVM "${CMAKE_SOURCE_DIR}/lib/sqfvm")
3333
set(LIBRARY_PATH_B64 "${CMAKE_SOURCE_DIR}/lib/cpp-base64")
3434
set(LIBRARY_PATH_LZO "${CMAKE_SOURCE_DIR}/lib/lzokay")
35-
set(LIBRARY_PATH_JSON "${CMAKE_SOURCE_DIR}/lib/json/single_include")
35+
set(LIBRARY_PATH_JSON "${CMAKE_SOURCE_DIR}/lib/json")
3636
set(LIBRARY_PATH_SOL2 "${CMAKE_SOURCE_DIR}/lib/sol2")
3737

3838
add_definitions(/DNOMINMAX)

lib/json

Submodule json updated from db78ac1 to 81e6e25

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <queue>
1616
#include <base64.h>
1717

18-
#include <nlohmann/json.hpp>
18+
#include <json.hpp>
1919
#include <src\luaHandler.hpp>
2020

2121
std::queue<std::filesystem::path> tasks;

0 commit comments

Comments
 (0)