json: move to libtrx

lahm86 · Apr 29, 2024 · 6a286a4 · 6a286a4
1 parent 625ba03
commit 6a286a4
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 5,001 deletions.
diff --git a/meson.build b/meson.build
@@ -262,11 +262,6 @@ sources = [
   'src/gfx/gl/vertex_array.c',
   'src/gfx/screenshot.c',
   'src/global/vars.c',
-  'src/json/bson_parse.c',
-  'src/json/bson_write.c',
-  'src/json/json_base.c',
-  'src/json/json_parse.c',
-  'src/json/json_write.c',
   'src/math/math.c',
   'src/math/math_misc.c',
   'src/math/matrix.c',

diff --git a/src/config.c b/src/config.c
@@ -7,10 +7,8 @@
 #include "gfx/context.h"
 #include "global/const.h"
 #include "global/types.h"
-#include "json/json_base.h"
-#include "json/json_parse.h"
-#include "json/json_write.h"
 #include "shared/filesystem.h"
+#include "shared/json.h"
 #include "shared/log.h"
 #include "shared/memory.h"
 #include "util.h"

diff --git a/src/game/gameflow.c b/src/game/gameflow.c
@@ -15,9 +15,8 @@
 #include "game/phase/phase_stats.h"
 #include "game/room.h"
 #include "global/vars.h"
-#include "json/json_base.h"
-#include "json/json_parse.h"
 #include "shared/filesystem.h"
+#include "shared/json.h"
 #include "shared/log.h"
 #include "shared/memory.h"
 

diff --git a/src/game/savegame/savegame_bson.c b/src/game/savegame/savegame_bson.c
@@ -13,9 +13,7 @@
 #include "game/shell.h"
 #include "global/const.h"
 #include "global/vars.h"
-#include "json/bson_parse.h"
-#include "json/bson_write.h"
-#include "json/json_base.h"
+#include "shared/json.h"
 #include "shared/log.h"
 #include "shared/memory.h"
 #include "util.h"

diff --git a/src/json.h b/src/json.h