Merge branch 'develop'

jespa007 · Feb 25, 2021 · 81ac4aa · 81ac4aa
2 parents 4ec7f71 + 4b13148
commit 81ac4aa
Show file tree

Hide file tree

Showing 27 changed files with 1,317 additions and 534 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -160,7 +160,8 @@ set( ZETJSONCPP_LIB_SRCS ${ZETJSONCPP_LIB_SRCS}
 	util/zj_path.cpp
 	jsonvar/JsonVar.cpp
 	jsonvar/JsonVarObject.cpp	
-	zetjsoncpp.cpp
+	zetjsoncpp_deserializer.cpp
+	zetjsoncpp_serializer.cpp
 )
 
 #JSON TEST executable