Codechange: vendor the nlohmann-json library (#11290)
(cherry picked from commit ba67f39db6
)
# Conflicts:
# .github/workflows/ci-build.yml
# CMakeLists.txt
# COMPILING.md
# src/os/macosx/survey_osx.cpp
# src/os/windows/survey_win.cpp
# src/script/api/script_admin.cpp
# src/script/api/script_event_types.cpp
# src/tests/test_script_admin.cpp
This commit is contained in:
1
src/3rdparty/CMakeLists.txt
vendored
1
src/3rdparty/CMakeLists.txt
vendored
@@ -3,6 +3,7 @@ add_subdirectory(fmt)
|
||||
add_subdirectory(icu)
|
||||
add_subdirectory(md5)
|
||||
add_subdirectory(squirrel)
|
||||
add_subdirectory(nlohmann)
|
||||
add_subdirectory(opengl)
|
||||
add_subdirectory(cpp-btree)
|
||||
add_subdirectory(mingw-std-threads)
|
||||
|
3
src/3rdparty/nlohmann/CMakeLists.txt
vendored
Normal file
3
src/3rdparty/nlohmann/CMakeLists.txt
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
add_files(
|
||||
json.hpp
|
||||
)
|
21
src/3rdparty/nlohmann/LICENSE.MIT
vendored
Normal file
21
src/3rdparty/nlohmann/LICENSE.MIT
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2013-2022 Niels Lohmann
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
24596
src/3rdparty/nlohmann/json.hpp
vendored
Normal file
24596
src/3rdparty/nlohmann/json.hpp
vendored
Normal file
File diff suppressed because it is too large
Load Diff
@@ -37,7 +37,7 @@
|
||||
#include "../base_media_base.h"
|
||||
#include "../blitter/factory.hpp"
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
#include "../3rdparty/nlohmann/json.hpp"
|
||||
|
||||
#include "../safeguards.h"
|
||||
|
||||
|
@@ -10,10 +10,10 @@
|
||||
#include "../../stdafx.h"
|
||||
|
||||
#include "../../core/format.hpp"
|
||||
#include "../../3rdparty/nlohmann/json.hpp"
|
||||
#include "macos.h"
|
||||
|
||||
#include <mach-o/arch.h>
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <thread>
|
||||
|
||||
#include "../../safeguards.h"
|
||||
|
@@ -9,7 +9,8 @@
|
||||
|
||||
#include "../../stdafx.h"
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
#include "../../3rdparty/nlohmann/json.hpp"
|
||||
|
||||
#include <sys/utsname.h>
|
||||
#include <thread>
|
||||
#include <unistd.h>
|
||||
|
@@ -10,8 +10,8 @@
|
||||
#include "../../stdafx.h"
|
||||
|
||||
#include "../../core/format.hpp"
|
||||
#include "../../3rdparty/nlohmann/json.hpp"
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <thread>
|
||||
#include <windows.h>
|
||||
|
||||
|
@@ -16,6 +16,7 @@
|
||||
#include "../../engine_base.h"
|
||||
#include "../../articulated_vehicles.h"
|
||||
#include "../../string_func.h"
|
||||
#include "../../3rdparty/nlohmann/json.hpp"
|
||||
#include "table/strings.h"
|
||||
|
||||
#include "../../safeguards.h"
|
||||
|
Reference in New Issue
Block a user