From 4408215c7aaa20ca3006e33fbc215cf5f37169c1 Mon Sep 17 00:00:00 2001 From: Andrey Zimin Date: Wed, 15 May 2024 18:04:15 +0300 Subject: [PATCH] remove nlohmann_json --- meson.build | 1 - src/utils/include.hpp | 2 +- src/utils/using.hpp | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/meson.build b/meson.build index f32f189..26a9da4 100755 --- a/meson.build +++ b/meson.build @@ -41,7 +41,6 @@ deps = [ subproject('glad').get_variable('glad_dep'), subproject('hack').get_variable('hack_dep'), subproject('imgui').get_variable('imgui_dep'), - subproject('nlohmann_json').get_variable('nlohmann_json_dep'), subproject('glm').get_variable('glm_dep'), ] diff --git a/src/utils/include.hpp b/src/utils/include.hpp index bdf7368..9b97f8e 100755 --- a/src/utils/include.hpp +++ b/src/utils/include.hpp @@ -9,6 +9,7 @@ #include #include #include +#include /* Если первым включен glad @@ -28,4 +29,3 @@ #include "imgui.h" #include "imgui_impl_glfw.h" #include "imgui_impl_opengl3.h" -#include "nlohmann/json.hpp" diff --git a/src/utils/using.hpp b/src/utils/using.hpp index 0052acf..a76e559 100644 --- a/src/utils/using.hpp +++ b/src/utils/using.hpp @@ -9,8 +9,6 @@ namespace VE template using layers_stack = std::vector; - - using JSON = nlohmann::json; }