Move JSON and JSONParser to core/json

engine/Android.mk

@@ -20,8 +20,10 @@ LOCAL_SRC_FILES :=\
 	core/bv/Circle.cpp\
 	core/bv/Frustum.cpp\
 	core/bv/Rect.cpp\
+\
 	core/compressors/ZipCompressor.cpp\
 	core/containers/Generic.cpp\
+\
 	core/filesystem/BinaryReader.cpp\
 	core/filesystem/BinaryWriter.cpp\
 	core/filesystem/DiskFile.cpp\
@@ -29,6 +31,10 @@ LOCAL_SRC_FILES :=\
 	core/filesystem/Filesystem.cpp\
 	core/filesystem/TextReader.cpp\
 	core/filesystem/TextWriter.cpp\
+\
+	core/json/JSON.cpp
+	core/json/JSONParser.cpp
+\
 	core/math/Color4.cpp\
 	core/math/Mat3.cpp\
 	core/math/Mat4.cpp\
@@ -38,15 +44,18 @@ LOCAL_SRC_FILES :=\
 	core/math/Vec2.cpp\
 	core/math/Vec3.cpp\
 	core/math/Vec4.cpp\
+\
 	core/mem/Allocator.cpp\
 	core/mem/HeapAllocator.cpp\
 	core/mem/LinearAllocator.cpp\
 	core/mem/ProxyAllocator.cpp\
 	core/mem/StackAllocator.cpp\
 	core/mem/Memory.cpp\
+\
 	core/settings/FloatSetting.cpp\
 	core/settings/IntSetting.cpp\
 	core/settings/StringSetting.cpp\
+\
 	core/Args.cpp\
 	core/Log.cpp\
 \
@@ -101,7 +110,6 @@ LOCAL_SRC_FILES :=\
 	FileBundle.cpp\
 	FontResource.cpp\
 	FPSSystem.cpp\
-	JSONParser.cpp\
 	MaterialResource.cpp\
 	PixelShaderResource.cpp\
 	ResourceManager.cpp\
@@ -122,6 +130,7 @@ LOCAL_C_INCLUDES	:=\
 	$(LOCAL_PATH)/core/math\
 	$(LOCAL_PATH)/core/mem\
 	$(LOCAL_PATH)/core/filesystem\
+	$(LOCAL_PATH)/core/json\
 	$(LOCAL_PATH)/core/settings\
 	$(LOCAL_PATH)/core/strings\
 	$(LOCAL_PATH)/input\

engine/CMakeLists.txt

@@ -47,6 +47,7 @@ set (CROWN_INCLUDES
 	${CMAKE_SOURCE_DIR}/engine/core/mem
 	${CMAKE_SOURCE_DIR}/engine/core/compressors
 	${CMAKE_SOURCE_DIR}/engine/core/filesystem
+	${CMAKE_SOURCE_DIR}/engine/core/json
 	${CMAKE_SOURCE_DIR}/engine/core/strings
 	${CMAKE_SOURCE_DIR}/engine/core/settings
 	${CMAKE_SOURCE_DIR}/engine/os
@@ -57,7 +58,6 @@ set (CROWN_INCLUDES
 )
 
 set (SRC
-	JSON.cpp
 	Camera.cpp
 	Device.cpp
 	MaterialResource.cpp
@@ -70,15 +70,11 @@ set (SRC
 	PixelShaderResource.cpp
 	ArchiveBundle.cpp
 	FileBundle.cpp
-
-	JSONParser.cpp
 	ConsoleServer.cpp
-
 	FPSSystem.cpp
 )
 
 set (HEADERS
-	JSON.h
 	Camera.h
 	Config.h
 	Crown.h
@@ -96,10 +92,7 @@ set (HEADERS
 	PixelShaderResource.h
 	ArchiveBundle.h
 	FileBundle.h
-
-	JSONParser.h
 	ConsoleServer.h
-
 	FPSSystem.h
 )
 
@@ -199,6 +192,16 @@ set (FILESYSTEM_HEADERS
 	core/filesystem/Filesystem.h
 )
 
+set (JSON_SRC
+	core/json/JSON.cpp
+	core/json/JSONParser.cpp
+)
+
+set (JSON_HEADERS
+	core/json/JSON.h
+	core/json/JSONParser.h
+)
+
 set (STRINGS_SRC
 )
 
@@ -452,6 +455,7 @@ set (CROWN_SOURCES
 	${CONTAINERS_SRC}
 	${MATH_SRC}
 	${FILESYSTEM_SRC}
+	${JSON_SRC}
 	${MEM_SRC}
 	${COMPRESSORS_SRC}
 	${SETTINGS_SRC}
@@ -474,6 +478,7 @@ set (CROWN_HEADERS
 	${CONTAINERS_HEADERS}
 	${MATH_HEADERS}
 	${FILESYSTEM_HEADERS}
+	${JSON_HEADERS}
 	${MEM_HEADERS}
 	${COMPRESSORS_HEADERS}
 	${SETTINGS_HEADERS}

engine/Crown.h

@@ -89,6 +89,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "TextWriter.h"
 #include "Filesystem.h"
 
+// Core/Json
+#include "JSON.h"
+#include "JSONParser.h"
+
 // Core/Threads
 #include "Thread.h"
 #include "Mutex.h"