json: Actually include in build.

hrydgard · Apr 14, 2018 · 0810d0f · 0810d0f
1 parent 409d5b9
commit 0810d0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -921,10 +921,6 @@ add_library(native STATIC
 	ext/native/data/base64.h
 	ext/native/data/compression.cpp
 	ext/native/data/compression.h
-	ext/native/ext/vjson/json.cpp
-	ext/native/ext/vjson/json.h
-	ext/native/ext/vjson/block_allocator.cpp
-	ext/native/ext/vjson/block_allocator.h
 	ext/native/file/chunk_file.cpp
 	ext/native/file/chunk_file.h
 	ext/native/file/fd_util.cpp
@@ -978,6 +974,8 @@ add_library(native STATIC
 	ext/native/input/keycodes.h
 	ext/native/input/input_state.h
 	ext/native/input/input_state.cpp
+	ext/native/json/json_writer.h
+	ext/native/json/json_writer.cpp
 	ext/native/math/fast/fast_math.c
 	ext/native/math/fast/fast_matrix.c
 	ext/native/math/fast/fast_matrix_neon.S

diff --git a/ext/native/json/json_writer.cpp b/ext/native/json/json_writer.cpp
@@ -1,4 +1,5 @@
 #include <iomanip>
+#include <cstring>
 #include "json/json_writer.h"
 
 JsonWriter::JsonWriter(int flags) {
@@ -49,7 +50,7 @@ const char *JsonWriter::comma() const {
 	if (stack_.back().first) {
 		return "";
 	} else {
-		return ",\n";
+		return pretty_ ? ",\n" : ",";
 	}
 }