GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply patches to rapidjson
Some checks are pending
Build Android / Game (Android, Release ARM64) (push) Waiting to run
Details
Build iOS / Game (iOS, Release ARM64) (push) Waiting to run
Details
Build Linux / Editor (Linux, Development x64) (push) Waiting to run
Details
Build Linux / Game (Linux, Release x64) (push) Waiting to run
Details
Build macOS / Editor (Mac, Development ARM64) (push) Waiting to run
Details
Build macOS / Game (Mac, Release ARM64) (push) Waiting to run
Details
Build Windows / Editor (Windows, Development x64) (push) Waiting to run
Details
Build Windows / Game (Windows, Release x64) (push) Waiting to run
Details
Cooker / Cook (Mac) (push) Waiting to run
Details
Tests / Tests (Linux) (push) Waiting to run
Details
Tests / Tests (Windows) (push) Waiting to run
Details

Browse Source
This commit is contained in:
Ari Vuollet
2025-01-15 00:16:32 +02:00
parent c5c1751f74
commit aac7149106
6 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Engine/Serialization/Json.h
View File

@@ -5,14 +5,23 @@
#include "Engine/Core/Types/String.h"
#include "Engine/Core/Types/StringView.h"
// TODO: config RAPIDJSON_SSE2 for rapidjson
// TODO: config RAPIDJSON_SSE42 for rapidjson
#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64)
//#define RAPIDJSON_SSE42
#elif defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64)
//#define RAPIDJSON_NEON
#endif
#define RAPIDJSON_ERROR_CHARTYPE Char
#define RAPIDJSON_ERROR_STRING(x) TEXT(x)
#define RAPIDJSON_ASSERT(x) ASSERT(x)
#define RAPIDJSON_NEW(x) New<x>()
#define RAPIDJSON_NEW(x) New<x>
#define RAPIDJSON_DELETE(x) Delete(x)
#define RAPIDJSON_NOMEMBERITERATORCLASS
#include <ThirdParty/rapidjson/rapidjson.h>
//#define RAPIDJSON_MALLOC(size) ::malloc(size)
//#define RAPIDJSON_REALLOC(ptr, new_size) ::realloc(ptr, new_size)
//#define RAPIDJSON_FREE(ptr) ::free(ptr)
#include <ThirdParty/rapidjson/writer.h>
#include <ThirdParty/rapidjson/prettywriter.h>
#include <ThirdParty/rapidjson/document.h>