SantaSpeen/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/SantaSpeen/BeamMP-Server.git synced 2025-07-04 05:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

add nlohmann/json

Browse Source 
this will conflict with a change in the http branch, but i dont care
right now
This commit is contained in:
Lion Kortlepel 2022-02-11 10:18:56 +01:00
parent b72de4bd0a
commit f26ca6b40d
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -22,3 +22,6 @@
[submodule "deps/cpp-httplib"] [submodule "deps/cpp-httplib"]
path = deps/cpp-httplib path = deps/cpp-httplib
url = https://github.com/yhirose/cpp-httplib url = https://github.com/yhirose/cpp-httplib
[submodule "deps/json"]
path = deps/json
url = https://github.com/nlohmann/json

1
deps/json vendored Submodule

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

4
src/TServer.cpp
View File

@ -7,13 +7,15 @@
#include <any> #include <any>
#include <sstream> #include <sstream>
#include <nlohmann/json.hpp>
#include "LuaAPI.h" #include "LuaAPI.h"
#undef GetObject // Fixes Windows #undef GetObject // Fixes Windows
#include "Json.h" #include "Json.h"
namespace json = rapidjson; namespace json = nlohmann::json;
TServer::TServer(const std::vector<std::string_view>& Arguments) { TServer::TServer(const std::vector<std::string_view>& Arguments) {
beammp_info("BeamMP Server v" + Application::ServerVersionString()); beammp_info("BeamMP Server v" + Application::ServerVersionString());