amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-29 09:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

move amalgamate tool to third_party folder

Browse Source
This commit is contained in:
Théo DELRIEU committed 2018-01-13 13:05:42 +01:00
1 parent 922b56e492
commit 84bffd5d36
7 files changed
+1 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
-1
View File
@@ -21,4 +21,3 @@ benchmarks/files/numbers/*.json
cmake-build-debug cmake-build-debug
test/test-* test/test-*
third_party/Amalgamate
Makefile
+1 -1
View File
@@ -252,7 +252,7 @@ pretty:
amalgamate: src/json.hpp amalgamate: src/json.hpp
src/json.hpp: $(SRCS) src/json.hpp: $(SRCS)
develop/amalgamate/amalgamate.py -c develop/amalgamate/config.json -s develop --verbose=yes third_party/amalgamate/amalgamate.py -c third_party/amalgamate/config.json -s develop --verbose=yes
$(MAKE) pretty $(MAKE) pretty
develop/amalgamate/CHANGES.md → third_party/amalgamate/CHANGES.md
Vendored
View File
File renamed without changes.
develop/amalgamate/LICENSE.md → third_party/amalgamate/LICENSE.md
Vendored
View File
File renamed without changes.
develop/amalgamate/README.md → third_party/amalgamate/README.md
Vendored
View File
File renamed without changes.
develop/amalgamate/amalgamate.py → third_party/amalgamate/amalgamate.py
Vendored Executable → Regular
View File
File renamed without changes.
develop/amalgamate/config.json → third_party/amalgamate/config.json
Vendored
View File
File renamed without changes.