Common.h shouldn't include Log.h.

Buildfixes

More buildfixes. Move JSON code to common.

CMakeLists.txt

@@ -451,6 +451,10 @@ add_library(Common STATIC
 	Common/Data/Format/RIFF.h
 	Common/Data/Format/IniFile.cpp
 	Common/Data/Format/IniFile.h
+	Common/Data/Format/JSONReader.h
+	Common/Data/Format/JSONReader.cpp
+	Common/Data/Format/JSONWriter.h
+	Common/Data/Format/JSONWriter.cpp
 	Common/Data/Hash/Hash.cpp
 	Common/Data/Hash/Hash.h
 	Common/Data/Text/I18n.cpp
@@ -1041,10 +1045,6 @@ add_library(native STATIC
 	ext/native/image/zim_load.h
 	ext/native/image/zim_save.cpp
 	ext/native/image/zim_save.h
-	ext/native/json/json_reader.h
-	ext/native/json/json_reader.cpp
-	ext/native/json/json_writer.h
-	ext/native/json/json_writer.cpp
 	ext/native/net/http_client.cpp
 	ext/native/net/http_client.h
 	ext/native/net/http_headers.cpp

Common/Arm64Emitter.cpp

@@ -12,13 +12,12 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "Arm64Emitter.h"
-#include "MathUtil.h"
-#include "CommonTypes.h"
-#include "CommonWindows.h"
-#include "CPUDetect.h"
-
-#include "CommonWindows.h"
+#include "Common/Arm64Emitter.h"
+#include "Common/MathUtil.h"
+#include "Common/CommonTypes.h"
+#include "Common/CommonWindows.h"
+#include "Common/CPUDetect.h"
+#include "Common/Log.h"
 
 #ifdef IOS
 #include <libkern/OSCacheControl.h>

Common/Arm64Emitter.h

@@ -6,10 +6,11 @@
 
 #include <functional>
 
-#include "ArmCommon.h"
-#include "BitSet.h"
-#include "CodeBlock.h"
-#include "Common.h"
+#include "Common/ArmCommon.h"
+#include "Common/BitSet.h"
+#include "Common/CodeBlock.h"
+#include "Common/Common.h"
+#include "Common/Log.h"
 
 #define DYNA_REC JIT
 

Common/ArmEmitter.h

@@ -20,9 +20,10 @@
 #include <vector>
 #include <cstdint>
 
-#include "Common.h"
-#include "ArmCommon.h"
-#include "CodeBlock.h"
+#include "Common/Common.h"
+#include "Common/Log.h"
+#include "Common/ArmCommon.h"
+#include "Common/CodeBlock.h"
 
 // VCVT flags
 #define TO_FLOAT      0

Common/CodeBlock.h

@@ -5,8 +5,10 @@
 #pragma once
 
 #include <cstddef>
-#include "Common.h"
-#include "MemoryUtil.h"
+
+#include "Common/CommonTypes.h"
+#include "Common/Log.h"
+#include "Common/MemoryUtil.h"
 
 // Everything that needs to generate code should inherit from this.
 // You get memory management for free, plus, you can use all emitter functions without

Common/Common.h

@@ -28,7 +28,6 @@
 #pragma warning(disable:4996)
 #endif
 
-#include "Log.h"
 #include "CommonTypes.h"
 #include "CommonFuncs.h"
 

Common/Common.vcxproj

@@ -369,6 +369,8 @@
     <ClInclude Include="Data\Encoding\Utf16.h" />
     <ClInclude Include="Data\Encoding\Utf8.h" />
     <ClInclude Include="Data\Format\IniFile.h" />
+    <ClInclude Include="Data\Format\JSONReader.h" />
+    <ClInclude Include="Data\Format\JSONWriter.h" />
     <ClInclude Include="Data\Format\RIFF.h" />
     <ClInclude Include="Data\Hash\Hash.h" />
     <ClInclude Include="Data\Random\Rng.h" />
@@ -647,6 +649,8 @@
     <ClCompile Include="Data\Encoding\Compression.cpp" />
     <ClCompile Include="Data\Encoding\Utf8.cpp" />
     <ClCompile Include="Data\Format\IniFile.cpp" />
+    <ClCompile Include="Data\Format\JSONReader.cpp" />
+    <ClCompile Include="Data\Format\JSONWriter.cpp" />
     <ClCompile Include="Data\Format\RIFF.cpp" />
     <ClCompile Include="Data\Hash\Hash.cpp" />
     <ClCompile Include="Data\Text\I18n.cpp" />

Common/Common.vcxproj.filters

@@ -220,6 +220,12 @@
     <ClInclude Include="Data\Format\IniFile.h">
       <Filter>Data\Format</Filter>
     </ClInclude>
+    <ClInclude Include="Data\Format\JSONReader.h">
+      <Filter>Data\Format</Filter>
+    </ClInclude>
+    <ClInclude Include="Data\Format\JSONWriter.h">
+      <Filter>Data\Format</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ABI.cpp" />
@@ -421,6 +427,12 @@
     <ClCompile Include="Data\Format\IniFile.cpp">
       <Filter>Data\Format</Filter>
     </ClCompile>
+    <ClCompile Include="Data\Format\JSONReader.cpp">
+      <Filter>Data\Format</Filter>
+    </ClCompile>
+    <ClCompile Include="Data\Format\JSONWriter.cpp">
+      <Filter>Data\Format</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Crypto">

Common/Data/Format/JSONReader.cpp

@@ -1,5 +1,5 @@
 #include "Common/File/VFS/VFS.h"
-#include "json/json_reader.h"
+#include "Common/Data/Format/JSONReader.h"
 
 namespace json {
 

Common/Data/Format/JSONWriter.cpp

@@ -2,8 +2,8 @@
 #include <cmath>
 #include <cstring>
 
-#include "json/json_reader.h"
-#include "json/json_writer.h"
+#include "Common/Data/Format/JSONReader.h"
+#include "Common/Data/Format/JSONWriter.h"
 
 namespace json {
 

Common/File/PathBrowser.cpp

@@ -8,6 +8,7 @@
 #include "Common/File/PathBrowser.h"
 #include "Common/StringUtils.h"
 #include "Common/TimeUtil.h"
+#include "Common/Log.h"
 #include "Common/Thread/ThreadUtil.h"
 
 bool LoadRemoteFileList(const std::string &url, bool *cancel, std::vector<FileInfo> &files) {

Common/FileUtil.cpp

@@ -27,6 +27,7 @@
 #include <cstring>
 #include <memory>
 
+#include "Common/Log.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtils.h"
 #include "Common/SysError.h"
@@ -511,7 +512,7 @@ bool GetFileDetails(const std::string &filename, FileDetails *details) {
 	if (!GetFileAttributesEx(ConvertUTF8ToWString(filename).c_str(), GetFileExInfoStandard, &attr))
 		return false;
 	details->isDirectory = (attr.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
-	details->size = ((u64)attr.nFileSizeHigh << 32) | (u64)attr.nFileSizeLow;
+	details->size = ((uint64_t)attr.nFileSizeHigh << 32) | (uint64_t)attr.nFileSizeLow;
 	details->atime = FiletimeToStatTime(attr.ftLastAccessTime);
 	details->mtime = FiletimeToStatTime(attr.ftLastWriteTime);
 	details->ctime = FiletimeToStatTime(attr.ftCreationTime);
@@ -588,14 +589,14 @@ std::string GetFilename(std::string path) {
 
 // Returns the size of file (64bit)
 // TODO: Add a way to return an error.
-u64 GetFileSize(const std::string &filename) {
+uint64_t GetFileSize(const std::string &filename) {
 #if defined(_WIN32) && defined(UNICODE)
 	WIN32_FILE_ATTRIBUTE_DATA attr;
 	if (!GetFileAttributesEx(ConvertUTF8ToWString(filename).c_str(), GetFileExInfoStandard, &attr))
 		return 0;
 	if (attr.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
 		return 0;
-	return ((u64)attr.nFileSizeHigh << 32) | (u64)attr.nFileSizeLow;
+	return ((uint64_t)attr.nFileSizeHigh << 32) | (uint64_t)attr.nFileSizeLow;
 #else
 #if __ANDROID__ && __ANDROID_API__ < 21
 	struct stat file_info;
@@ -618,14 +619,14 @@ u64 GetFileSize(const std::string &filename) {
 }
 
 // Overloaded GetSize, accepts FILE*
-u64 GetFileSize(FILE *f) {
+uint64_t GetFileSize(FILE *f) {
 	// can't use off_t here because it can be 32-bit
-	u64 pos = ftello(f);
+	uint64_t pos = ftello(f);
 	if (fseeko(f, 0, SEEK_END) != 0) {
 		ERROR_LOG(COMMON, "GetSize: seek failed %p: %s", f, GetLastErrorMsg().c_str());
 		return 0;
 	}
-	u64 size = ftello(f);
+	uint64_t size = ftello(f);
 	if ((size != pos) && (fseeko(f, pos, SEEK_SET) != 0)) {
 		ERROR_LOG(COMMON, "GetSize: seek failed %p: %s", f, GetLastErrorMsg().c_str());
 		return 0;
@@ -904,7 +905,7 @@ void IOFile::SetHandle(std::FILE* file)
 	m_file = file;
 }
 
-u64 IOFile::GetSize()
+uint64_t IOFile::GetSize()
 {
 	if (IsOpen())
 		return File::GetFileSize(m_file);
@@ -912,7 +913,7 @@ u64 IOFile::GetSize()
 		return 0;
 }
 
-bool IOFile::Seek(s64 off, int origin)
+bool IOFile::Seek(int64_t off, int origin)
 {
 	if (!IsOpen() || 0 != fseeko(m_file, off, origin))
 		m_good = false;
@@ -920,7 +921,7 @@ bool IOFile::Seek(s64 off, int origin)
 	return m_good;
 }
 
-u64 IOFile::Tell()
+uint64_t IOFile::Tell()
 {	
 	if (IsOpen())
 		return ftello(m_file);
@@ -936,7 +937,7 @@ bool IOFile::Flush()
 	return m_good;
 }
 
-bool IOFile::Resize(u64 size)
+bool IOFile::Resize(uint64_t size)
 {
 	if (!IsOpen() || 0 !=
 #ifdef _WIN32

Common/FileUtil.h

@@ -22,6 +22,7 @@
 #include <string>
 #include <vector>
 #include <time.h>
+#include <cstdint>
 
 #include "Common.h"
 
@@ -37,7 +38,7 @@ namespace File {
 
 struct FileDetails {
 	bool isDirectory;
-	u64 size;
+	uint64_t size;
 	uint64_t atime;
 	uint64_t mtime;
 	uint64_t ctime;
@@ -70,10 +71,10 @@ std::string GetFilename(std::string path);
 bool GetModifTime(const std::string &filename, tm &return_time);
 
 // Returns the size of filename (64bit)
-u64 GetFileSize(const std::string &filename);
+uint64_t GetFileSize(const std::string &filename);
 
 // Overloaded GetSize, accepts FILE*
-u64 GetFileSize(FILE *f);
+uint64_t GetFileSize(FILE *f);
 
 // Returns true if successful, or path already exists.
 bool CreateDir(const std::string &filename);
@@ -121,7 +122,7 @@ const std::string &GetExeDirectory();
 class IOFile {
 public:
 	IOFile();
-	IOFile(std::FILE* file);
+	IOFile(FILE* file);
 	IOFile(const std::string& filename, const char openmode[]);
 	~IOFile();
 
@@ -172,10 +173,10 @@ public:
 
 	void SetHandle(std::FILE* file);
 
-	bool Seek(s64 off, int origin);
-	u64 Tell();
-	u64 GetSize();
-	bool Resize(u64 size);
+	bool Seek(int64_t off, int origin);
+	uint64_t Tell();
+	uint64_t GetSize();
+	bool Resize(uint64_t size);
 	bool Flush();
 
 	// clear error state

Common/x64Emitter.h

@@ -15,14 +15,15 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#ifndef _DOLPHIN_INTEL_CODEGEN_
-#define _DOLPHIN_INTEL_CODEGEN_
+#pragma once
 
 #include "ppsspp_config.h"
 
 #include <cstddef>
-#include "Common.h"
-#include "CodeBlock.h"
+
+#include "Common/Common.h"
+#include "Common/Log.h"
+#include "Common/CodeBlock.h"
 
 #if PPSSPP_ARCH(64BIT)
 #define PTRBITS 64
@@ -1083,5 +1084,3 @@ public:
 };
 
 }  // namespace
-
-#endif

Core/Config.cpp

@@ -23,16 +23,18 @@
 #include <sstream>
 
 #include "ppsspp_config.h"
+
 #include "base/display.h"
 #include "base/NativeApp.h"
-#include "Common/Data/Format/IniFile.h"
-#include "Common/Data/Text/I18n.h"
-#include "json/json_reader.h"
 #include "gfx_es2/gpu_features.h"
 #include "net/http_client.h"
-#include "Common/Data/Text/Parsers.h"
 #include "net/url.h"
 
+#include "Common/Log.h"
+#include "Common/Data/Format/IniFile.h"
+#include "Common/Data/Format/JSONReader.h"
+#include "Common/Data/Text/I18n.h"
+#include "Common/Data/Text/Parsers.h"
 #include "Common/CPUDetect.h"
 #include "Common/FileUtil.h"
 #include "Common/LogManager.h"

Core/Debugger/SymbolMap.cpp

@@ -31,9 +31,11 @@
 #include <algorithm>
 #include <memory>
 
-#include "Common/Data/Encoding/Utf8.h"
 #include "zlib.h"
+
 #include "Common/CommonTypes.h"
+#include "Common/Data/Encoding/Utf8.h"
+#include "Common/Log.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtils.h"
 #include "Core/MemMap.h"

Core/Debugger/WebSocket/WebSocketUtils.cpp

@@ -17,10 +17,17 @@
 
 #include <cmath>
 #include <limits>
+
 #include "Common/Data/Text/Parsers.h"
 #include "Common/StringUtils.h"
 #include "Core/Debugger/WebSocket/WebSocketUtils.h"
 
+inline void DebuggerJsonAddTicket(JsonWriter &writer, const JsonGet &data) {
+	const JsonNode *value = data.get("ticket");
+	if (value)
+		writer.writeRaw("ticket", json_stringify(value));
+}
+
 JsonWriter &DebuggerRequest::Respond() {
 	writer_.begin();
 	writer_.writeString("event", name);

Core/Debugger/WebSocket/WebSocketUtils.h

@@ -17,15 +17,15 @@
 
 #pragma once
 
+#include "ppsspp_config.h"
+
 #include <string>
 
-#include "json/json_reader.h"
-#include "json/json_writer.h"
 #include "net/websocket_server.h"
 
 #include "Common/Log.h"
-
-#include "ppsspp_config.h"
+#include "Common/Data/Format/JSONReader.h"
+#include "Common/Data/Format/JSONWriter.h"
 
 #if PPSSPP_PLATFORM(UWP)
 // Enum name overlapped with UWP macro, quick hack to disable it
@@ -34,12 +34,6 @@
 
 using namespace json;
 
-static inline void DebuggerJsonAddTicket(JsonWriter &writer, const JsonGet &data) {
-	const JsonNode *value = data.get("ticket");
-	if (value)
-		writer.writeRaw("ticket", json_stringify(value));
-}
-
 struct DebuggerErrorEvent {
 	DebuggerErrorEvent(const std::string m, LogTypes::LOG_LEVELS l, const JsonGet data = JsonValue(JSON_NULL))
 		: message(m), level(l) {

Core/ELF/PrxDecrypter.cpp

@@ -8,6 +8,7 @@ extern "C"
 #include "ext/libkirk/SHA1.h"
 }
 #include "Common/Common.h"
+#include "Common/Log.h"
 #include "Common/Swap.h"
 #include "Core/ELF/PrxDecrypter.h"
 

Core/FileLoaders/DiskCachingFileLoader.cpp

@@ -26,6 +26,7 @@
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/File/DiskFree.h"
 #include "Common/FileUtil.h"
+#include "Common/Log.h"
 #include "Common/CommonWindows.h"
 #include "Core/FileLoaders/DiskCachingFileLoader.h"
 #include "Core/System.h"

Core/FileLoaders/HTTPFileLoader.cpp

@@ -18,6 +18,7 @@
 #include <algorithm>
 
 #include "Common/Common.h"
+#include "Common/Log.h"
 #include "Common/StringUtils.h"
 #include "Core/FileLoaders/HTTPFileLoader.h"
 

Core/FileLoaders/LocalFileLoader.cpp

@@ -18,8 +18,10 @@
 #include <cstdio>
 
 #include "ppsspp_config.h"
-#include "Common/Data/Encoding/Utf8.h"
+
 #include "file/file_util.h"
+#include "Common/Data/Encoding/Utf8.h"
+#include "Common/Log.h"
 #include "Common/FileUtil.h"
 #include "Core/FileLoaders/LocalFileLoader.h"
 

Core/FileSystems/BlockDevices.cpp

@@ -21,6 +21,7 @@
 
 #include "Common/Data/Text/I18n.h"
 #include "Common/FileUtil.h"
+#include "Common/Log.h"
 #include "Common/Swap.h"
 #include "Core/Loaders.h"
 #include "Core/Host.h"

Core/FileSystems/tlzrc.cpp

@@ -23,7 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "Common.h"
+#include "Common/Common.h"
+#include "Common/Log.h"
 
 /*************************************************************/
 

Core/HLE/sceKernel.h

@@ -21,6 +21,7 @@
 #include <string>
 
 #include "Common/Common.h"
+#include "Common/Log.h"
 #include "Common/Swap.h"
 
 class PointerWrap;

Core/MIPS/JitCommon/JitState.h

@@ -19,6 +19,7 @@
 #pragma once
 
 #include "Common/Common.h"
+#include "Common/Log.h"
 #include "Core/MIPS/MIPS.h"
 
 struct JitBlock;

Core/MIPS/MIPSAnalyst.cpp

@@ -22,7 +22,10 @@
 #include <mutex>
 
 #include "ext/cityhash/city.h"
+#include "ext/xxhash.h"
+
 #include "Common/FileUtil.h"
+#include "Common/Log.h"
 #include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/MemMap.h"
@@ -35,7 +38,6 @@
 #include "Core/Debugger/SymbolMap.h"
 #include "Core/Debugger/DebugInterface.h"
 #include "Core/HLE/ReplaceTables.h"
-#include "ext/xxhash.h"
 
 using namespace MIPSCodeUtils;
 

Core/MemFault.cpp

@@ -28,6 +28,7 @@
 #include "ext/disarm.h"
 #endif
 
+#include "Common/Log.h"
 #include "Core/Core.h"
 #include "Core/MemFault.h"
 #include "Core/MemMap.h"

Core/Replay.cpp

@@ -18,7 +18,9 @@
 #include <cstring>
 #include <ctime>
 #include <vector>
+
 #include "Common/Common.h"
+#include "Common/Log.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtils.h"
 #include "Core/Replay.h"

Core/Screenshot.cpp

@@ -27,6 +27,7 @@
 
 #include "Common/ColorConv.h"
 #include "Common/FileUtil.h"
+#include "Common/Log.h"
 #include "Core/Config.h"
 #include "Core/Screenshot.h"
 #include "Core/Core.h"

Core/WaveFile.cpp

@@ -44,7 +44,7 @@ bool WaveFileWriter::Start(const std::string& filename, unsigned int HLESampleRa
 	Write(16);          // size of fmt block
 	Write(0x00020001);  // two channels, uncompressed
 
-	const u32 sample_rate = HLESampleRate;
+	const uint32_t sample_rate = HLESampleRate;
 	Write(sample_rate);
 	Write(sample_rate * 2 * 2);  // two channels, 16bit
 
@@ -53,7 +53,7 @@ bool WaveFileWriter::Start(const std::string& filename, unsigned int HLESampleRa
 	Write(100 * 1000 * 1000 - 32);
 
 	// We are now at offset 44
-	u64 offset = file.Tell();
+	uint64_t offset = file.Tell();
 	_assert_msg_(offset == 44, "Wrong offset: %lld", (long long)offset);
 	return true;
 }
@@ -70,7 +70,7 @@ void WaveFileWriter::Stop()
 	file.Close();
 }
 
-void WaveFileWriter::Write(u32 value)
+void WaveFileWriter::Write(uint32_t value)
 {
 	file.WriteArray(&value, 1);
 }
@@ -80,7 +80,7 @@ void WaveFileWriter::Write4(const char* ptr)
 	file.WriteBytes(ptr, 4);
 }
 
-void WaveFileWriter::AddStereoSamples(const short* sample_data, u32 count)
+void WaveFileWriter::AddStereoSamples(const short* sample_data, uint32_t count)
 {
 	_assert_msg_(file, "WaveFileWriter - file not open.");
 	_assert_msg_(count <= BUFFER_SIZE * 2, "WaveFileWriter - buffer too small (count = %u).", count);
@@ -89,7 +89,7 @@ void WaveFileWriter::AddStereoSamples(const short* sample_data, u32 count)
 	{
 		bool all_zero = true;
 
-		for (u32 i = 0; i < count * 2; i++)
+		for (uint32_t i = 0; i < count * 2; i++)
 		{
 			if (sample_data[i])
 				all_zero = false;

Core/WaveFile.h

@@ -14,6 +14,7 @@
 
 #include <array>
 #include <string>
+#include <cstdint>
 
 #include "Common/FileUtil.h"
 
@@ -36,6 +37,6 @@ private:
 	bool skip_silence = false;
 	uint32_t audio_size = 0;
 	std::array<short, BUFFER_SIZE> conv_buffer{};
-	void Write(u32 value);
+	void Write(uint32_t value);
 	void Write4(const char* ptr);
 };

GPU/Common/FramebufferManagerCommon.h

@@ -22,6 +22,7 @@
 #include <unordered_map>
 
 #include "Common/CommonTypes.h"
+#include "Common/Log.h"
 #include "Core/MemMap.h"
 #include "GPU/GPU.h"
 #include "GPU/ge_constants.h"

GPU/Common/PresentationCommon.cpp

@@ -24,6 +24,7 @@
 #include "thin3d/thin3d.h"
 
 #include "Common/File/VFS/VFS.h"
+#include "Common/Log.h"
 #include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"

GPU/Debugger/Debugger.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include "Common/Log.h"
 #include "GPU/GPU.h"
 #include "GPU/Debugger/Breakpoints.h"
 #include "GPU/Debugger/Debugger.h"

GPU/Debugger/Stepping.cpp

@@ -18,10 +18,11 @@
 #include <mutex>
 #include <condition_variable>
 
+#include "Common/Log.h"
+#include "Core/Core.h"
 #include "GPU/Common/GPUDebugInterface.h"
 #include "GPU/Debugger/Stepping.h"
 #include "GPU/GPUState.h"
-#include "Core/Core.h"
 
 namespace GPUStepping {
 

GPU/Vulkan/VulkanUtil.h

@@ -154,7 +154,6 @@ private:
 	void DestroyDeviceObjects();
 
 	VulkanContext *vulkan_ = nullptr;
-	VkPipelineCache cache_ = VK_NULL_HANDLE;
 	VkDescriptorSetLayout descriptorSetLayout_ = VK_NULL_HANDLE;
 	VkPipelineLayout pipelineLayout_ = VK_NULL_HANDLE;
 	VkPipelineCache pipelineCache_ = VK_NULL_HANDLE;

UI/RemoteISOScreen.cpp

@@ -28,12 +28,12 @@
 #include "base/NativeApp.h"
 // TODO: For text align flags, probably shouldn't be in gfx_es2/...
 #include "gfx_es2/draw_buffer.h"
-#include "json/json_reader.h"
 #include "net/http_client.h"
 #include "net/resolve.h"
 #include "net/url.h"
 
 #include "Common/File/PathBrowser.h"
+#include "Common/Data/Format/JSONReader.h"
 #include "Common/Data/Text/I18n.h"
 #include "Common/Common.h"
 #include "Common/TimeUtil.h"

UI/Store.cpp

@@ -17,9 +17,6 @@
 
 #include <functional>
 
-#include "json/json_reader.h"
-
-#include "Common/Data/Text/I18n.h"
 #include "ui/screen.h"
 #include "ui/ui_context.h"
 #include "ui/viewgroup.h"
@@ -27,6 +24,8 @@
 
 #include "Common/Common.h"
 #include "Common/Log.h"
+#include "Common/Data/Text/I18n.h"
+#include "Common/Data/Format/JSONReader.h"
 #include "Common/StringUtils.h"
 #include "Core/Config.h"
 #include "Core/System.h"

UI/TouchControlLayoutScreen.cpp

@@ -25,6 +25,7 @@
 #include "ui/ui_context.h"
 
 #include "Common/Common.h"
+#include "Common/Log.h"
 #include "Core/Config.h"
 #include "Core/System.h"
 #include "UI/GamepadEmu.h"

UWP/CommonUWP/CommonUWP.vcxproj

@@ -396,6 +396,8 @@
     <ClInclude Include="..\..\Common\Data\Encoding\Utf16.h" />
     <ClInclude Include="..\..\Common\Data\Encoding\Utf8.h" />
     <ClInclude Include="..\..\Common\Data\Format\IniFile.h" />
+    <ClInclude Include="..\..\Common\Data\Format\JSONReader.h" />
+    <ClInclude Include="..\..\Common\Data\Format\JSONWriter.h" />
     <ClInclude Include="..\..\Common\Data\Format\RIFF.h" />
     <ClInclude Include="..\..\Common\Data\Hash\Hash.h" />
     <ClInclude Include="..\..\Common\Data\Random\Rng.h" />
@@ -482,6 +484,8 @@
     <ClCompile Include="..\..\Common\Data\Encoding\Compression.cpp" />
     <ClCompile Include="..\..\Common\Data\Encoding\Utf8.cpp" />
     <ClCompile Include="..\..\Common\Data\Format\IniFile.cpp" />
+    <ClCompile Include="..\..\Common\Data\Format\JSONReader.cpp" />
+    <ClCompile Include="..\..\Common\Data\Format\JSONWriter.cpp" />
     <ClCompile Include="..\..\Common\Data\Format\RIFF.cpp" />
     <ClCompile Include="..\..\Common\Data\Hash\Hash.cpp" />
     <ClCompile Include="..\..\Common\Data\Text\I18n.cpp" />

UWP/CommonUWP/CommonUWP.vcxproj.filters

@@ -234,6 +234,12 @@
     <ClCompile Include="..\..\Common\Data\Format\IniFile.cpp">
       <Filter>Data\Format</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Common\Data\Format\JSONReader.cpp">
+      <Filter>Data\Format</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Common\Data\Format\JSONWriter.cpp">
+      <Filter>Data\Format</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="targetver.h" />
@@ -416,6 +422,12 @@
     <ClInclude Include="..\..\Common\Data\Format\IniFile.h">
       <Filter>Data\Format</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Common\Data\Format\JSONReader.h">
+      <Filter>Data\Format</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Common\Data\Format\JSONWriter.h">
+      <Filter>Data\Format</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\ext\libpng17\CMakeLists.txt">

UWP/NativeUWP/NativeUWP.vcxproj

@@ -384,8 +384,6 @@
     <ClInclude Include="..\..\ext\native\file\fd_util.h" />
     <ClInclude Include="..\..\ext\native\file\file_util.h" />
     <ClInclude Include="..\..\ext\native\gfx_es2\draw_text_uwp.h" />
-    <ClInclude Include="..\..\ext\native\json\json_reader.h" />
-    <ClInclude Include="..\..\ext\native\json\json_writer.h" />
     <ClInclude Include="..\..\ext\native\gfx\texture_atlas.h" />
     <ClInclude Include="..\..\ext\native\gfx_es2\draw_buffer.h" />
     <ClInclude Include="..\..\ext\native\gfx_es2\draw_text.h" />
@@ -416,8 +414,6 @@
     <ClCompile Include="..\..\ext\native\file\fd_util.cpp" />
     <ClCompile Include="..\..\ext\native\file\file_util.cpp" />
     <ClCompile Include="..\..\ext\native\gfx_es2\draw_text_uwp.cpp" />
-    <ClCompile Include="..\..\ext\native\json\json_reader.cpp" />
-    <ClCompile Include="..\..\ext\native\json\json_writer.cpp" />
     <ClCompile Include="..\..\ext\native\gfx\texture_atlas.cpp" />
     <ClCompile Include="..\..\ext\native\gfx_es2\draw_buffer.cpp" />
     <ClCompile Include="..\..\ext\native\gfx_es2\draw_text.cpp" />

UWP/NativeUWP/NativeUWP.vcxproj.filters

@@ -100,8 +100,6 @@
     <ClCompile Include="..\..\ext\native\gfx_es2\gpu_features.cpp">
       <Filter>gfx</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\native\json\json_reader.cpp" />
-    <ClCompile Include="..\..\ext\native\json\json_writer.cpp" />
     <ClCompile Include="..\..\ext\native\net\websocket_server.cpp">
       <Filter>net</Filter>
     </ClCompile>
@@ -187,8 +185,6 @@
     <ClInclude Include="..\..\ext\native\gfx_es2\gpu_features.h">
       <Filter>gfx</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\native\json\json_reader.h" />
-    <ClInclude Include="..\..\ext\native\json\json_writer.h" />
     <ClInclude Include="..\..\ext\native\net\websocket_server.h">
       <Filter>net</Filter>
     </ClInclude>

android/ab.cmd

@@ -5,6 +5,7 @@ copy ..\assets\langregion.ini assets\langregion.ini
 copy ..\assets\compat.ini assets\compat.ini
 copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf
 copy ..\assets\*.png assets\
-SET NDK=C:\AndroidNDK
+REM SET NDK=C:\Android\sdk\ndk\21.3.6528147
+SET NDK=C:\Android\ndk
 SET NDK_MODULE_PATH=..\ext;..\ext\native\ext
-%NDK%/ndk-build -j9 %*
+%NDK%/ndk-build -j32 %*

android/jni/Android.mk

@@ -104,22 +104,7 @@ endif
 NATIVE_FILES :=\
   $(SRC)/ext/native/base/display.cpp \
   $(SRC)/ext/native/file/fd_util.cpp \
-  $(SRC)/ext/native/file/chunk_file.cpp \
   $(SRC)/ext/native/file/file_util.cpp \
-  $(SRC)/ext/native/file/free.cpp \
-  $(SRC)/ext/native/file/path.cpp \
-  $(SRC)/ext/native/file/ini_file.cpp \
-  $(SRC)/ext/native/file/zip_read.cpp \
-  $(SRC)/ext/native/json/json_reader.cpp \
-  $(SRC)/ext/native/json/json_writer.cpp \
-  $(SRC)/ext/native/math/fast/fast_math.c \
-  $(SRC)/ext/native/math/fast/fast_matrix.c \
-  $(SRC)/ext/native/math/dataconv.cpp \
-  $(SRC)/ext/native/math/math_util.cpp \
-  $(SRC)/ext/native/math/curves.cpp \
-  $(SRC)/ext/native/math/expression_parser.cpp \
-  $(SRC)/ext/native/math/lin/vec3.cpp.arm \
-  $(SRC)/ext/native/math/lin/matrix4x4.cpp.arm \
   $(SRC)/ext/native/net/http_client.cpp \
   $(SRC)/ext/native/net/http_server.cpp \
   $(SRC)/ext/native/net/http_headers.cpp \
@@ -275,6 +260,9 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Common/Data/Encoding/Compression.cpp \
   $(SRC)/Common/Data/Encoding/Utf8.cpp \
   $(SRC)/Common/Data/Format/RIFF.cpp \
+  $(SRC)/Common/Data/Format/IniFile.cpp \
+  $(SRC)/Common/Data/Format/JSONReader.cpp \
+  $(SRC)/Common/Data/Format/JSONWriter.cpp \
   $(SRC)/Common/Data/Hash/Hash.cpp \
   $(SRC)/Common/Data/Text/I18n.cpp \
   $(SRC)/Common/Data/Text/Parsers.cpp \

ext/native/native.vcxproj

@@ -388,7 +388,6 @@
     <ClInclude Include="gfx_es2\draw_text_qt.h" />
     <ClInclude Include="gfx_es2\draw_text_uwp.h" />
     <ClInclude Include="gfx_es2\draw_text_win.h" />
-    <ClInclude Include="json\json_reader.h" />
     <ClInclude Include="net\websocket_server.h" />
     <ClInclude Include="thin3d\d3d11_loader.h" />
     <ClInclude Include="thin3d\d3d9_d3dcompiler_loader.h" />
@@ -408,7 +407,6 @@
     <ClInclude Include="image\png_load.h" />
     <ClInclude Include="image\zim_load.h" />
     <ClInclude Include="image\zim_save.h" />
-    <ClInclude Include="json\json_writer.h" />
     <ClInclude Include="net\http_client.h" />
     <ClInclude Include="net\http_headers.h" />
     <ClInclude Include="net\http_server.h" />
@@ -458,7 +456,6 @@
     <ClCompile Include="gfx_es2\draw_text_qt.cpp" />
     <ClCompile Include="gfx_es2\draw_text_uwp.cpp" />
     <ClCompile Include="gfx_es2\draw_text_win.cpp" />
-    <ClCompile Include="json\json_reader.cpp" />
     <ClCompile Include="net\websocket_server.cpp" />
     <ClCompile Include="thin3d\d3d11_loader.cpp" />
     <ClCompile Include="thin3d\d3d9_d3dcompiler_loader.cpp" />
@@ -486,7 +483,6 @@
     <ClCompile Include="image\png_load.cpp" />
     <ClCompile Include="image\zim_load.cpp" />
     <ClCompile Include="image\zim_save.cpp" />
-    <ClCompile Include="json\json_writer.cpp" />
     <ClCompile Include="net\http_client.cpp" />
     <ClCompile Include="net\http_headers.cpp" />
     <ClCompile Include="net\http_server.cpp" />

ext/native/native.vcxproj.filters

@@ -34,9 +34,6 @@
     <ClInclude Include="gfx\texture_atlas.h">
       <Filter>gfx</Filter>
     </ClInclude>
-    <ClInclude Include="json\json_writer.h">
-      <Filter>json</Filter>
-    </ClInclude>
     <ClInclude Include="file\file_util.h">
       <Filter>file</Filter>
     </ClInclude>
@@ -148,9 +145,6 @@
     <ClInclude Include="thin3d\thin3d_create.h">
       <Filter>thin3d</Filter>
     </ClInclude>
-    <ClInclude Include="json\json_reader.h">
-      <Filter>json</Filter>
-    </ClInclude>
     <ClInclude Include="net\websocket_server.h">
       <Filter>net</Filter>
     </ClInclude>
@@ -189,9 +183,6 @@
     <ClCompile Include="gfx\texture_atlas.cpp">
       <Filter>gfx</Filter>
     </ClCompile>
-    <ClCompile Include="json\json_writer.cpp">
-      <Filter>json</Filter>
-    </ClCompile>
     <ClCompile Include="file\file_util.cpp">
       <Filter>file</Filter>
     </ClCompile>
@@ -306,9 +297,6 @@
     <ClCompile Include="thin3d\DataFormatGL.cpp">
       <Filter>thin3d</Filter>
     </ClCompile>
-    <ClCompile Include="json\json_reader.cpp">
-      <Filter>json</Filter>
-    </ClCompile>
     <ClCompile Include="net\websocket_server.cpp">
       <Filter>net</Filter>
     </ClCompile>
@@ -338,9 +326,6 @@
     <Filter Include="base">
       <UniqueIdentifier>{95e41110-57a2-497f-a938-b4c8e9dd6a27}</UniqueIdentifier>
     </Filter>
-    <Filter Include="json">
-      <UniqueIdentifier>{cda27e9f-5763-4bf2-b6bc-85a377f7020e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="ui">
       <UniqueIdentifier>{d738c2d1-749d-4b60-b98f-f3da0bbbf40c}</UniqueIdentifier>
     </Filter>

ext/native/thin3d/thin3d_d3d11.cpp

@@ -7,10 +7,11 @@
 #include "thin3d/d3d11_loader.h"
 #endif
 #include "base/display.h"
+
 #include "Common/Data/Convert/SmallDataConvert.h"
 #include "Common/Data/Encoding/Utf8.h"
-
 #include "Common/ColorConv.h"
+#include "Common/Log.h"
 
 #include <cfloat>
 #include <D3DCommon.h>

headless/Headless.cpp

@@ -10,9 +10,10 @@
 #endif
 
 #include "base/NativeApp.h"
-#include "file/zip_read.h"
 #include "profiler/profiler.h"
 
+#include "Common/File/VFS/VFS.h"
+#include "Common/File/VFS/AssetReader.h"
 #include "Common/FileUtil.h"
 #include "Common/GraphicsContext.h"
 #include "Common/TimeUtil.h"

headless/StubHost.cpp

@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Common/FileUtil.h"
+#include "Common/Log.h"
 #include "Core/CoreParameter.h"
 #include "Core/System.h"
 #include "GPU/Common/GPUDebugInterface.h"

ios/ViewController.mm

@@ -14,24 +14,24 @@
 
 #include "base/display.h"
 #include "base/NativeApp.h"
-#include "Common/TimeUtil.h"
 #include "file/zip_read.h"
-#include "Common/Input/InputState.h"
 #include "net/resolve.h"
 #include "ui/screen.h"
 #include "thin3d/thin3d.h"
 #include "thin3d/thin3d_create.h"
 #include "thin3d/GLRenderManager.h"
-#include "Common/Input/KeyCodes.h"
 #include "gfx_es2/gpu_features.h"
 
+#include "Common/Log.h"
+#include "Common/TimeUtil.h"
+#include "Common/Input/InputState.h"
+#include "Common/Input/KeyCodes.h"
+#include "Common/GraphicsContext.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/System.h"
 #include "Core/HLE/sceUsbCam.h"
 #include "Core/HLE/sceUsbGps.h"
-#include "Common/GraphicsContext.h"
-#include "Common/Log.h"
 
 #include <sys/types.h>
 #include <sys/sysctl.h>

libretro/Makefile.common

@@ -150,18 +150,21 @@ SOURCES_CXX += \
 	$(COMMONDIR)/Data/Encoding/Utf8.cpp \
 	$(COMMONDIR)/Data/Format/RIFF.cpp \
 	$(COMMONDIR)/Data/Format/IniFile.cpp \
+	$(COMMONDIR)/Data/Format/JSONReader.cpp \
+	$(COMMONDIR)/Data/Format/JSONWriter.cpp \
 	$(COMMONDIR)/Data/Hash/Hash.cpp \
 	$(COMMONDIR)/Data/Text/I18n.cpp \
 	$(COMMONDIR)/Data/Text/Parsers.cpp \
 	$(COMMONDIR)/Data/Text/WrapText.cpp \
-
-SOURCES_CXX += \
 	$(COMMONDIR)/File/VFS/VFS.cpp \
 	$(COMMONDIR)/File/VFS/AssetReader.cpp \
 	$(COMMONDIR)/File/DiskFree.cpp \
-	$(COMMONDIR)/File/PathBrowser.cpp
-
-SOURCES_CXX += \
+	$(COMMONDIR)/File/PathBrowser.cpp \
+	$(COMMONDIR)/Math/curves.cpp \
+	$(COMMONDIR)/Math/expression_parser.cpp \
+	$(COMMONDIR)/Math/math_util.cpp \
+	$(COMMONDIR)/Math/lin/vec3.cpp \
+	$(COMMONDIR)/Math/lin/matrix4x4.cpp \
 	$(COMMONDIR)/Serialize/Serializer.cpp \
 	$(COMMONDIR)/Thread/Executor.cpp \
 	$(COMMONDIR)/Thread/ThreadUtil.cpp \
@@ -240,7 +243,6 @@ SOURCES_CXX += \
 	$(GPUDIR)/GLES/StateMappingGLES.cpp \
 	$(GPUDIR)/GLES/StencilBufferGLES.cpp \
 	$(EXTDIR)/native/base/display.cpp \
-	$(EXTDIR)/native/json/json_reader.cpp \
 	$(EXTDIR)/glslang/OGLCompilersDLL/InitializeDll.cpp \
 	$(EXTDIR)/glslang/glslang/GenericCodeGen/CodeGen.cpp \
 	$(EXTDIR)/glslang/glslang/GenericCodeGen/Link.cpp \
@@ -300,8 +302,7 @@ SOURCES_CXX += $(COMMONDIR)/MemArenaPosix.cpp \
 	       $(EXTDIR)/glslang/glslang/OSDependent/Unix/ossource.cpp
 endif
 
-SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
-	       $(NATIVEDIR)/file/fd_util.cpp \
+SOURCES_CXX += $(NATIVEDIR)/file/fd_util.cpp \
 	       $(NATIVEDIR)/file/file_util.cpp \
 	       $(NATIVEDIR)/gfx/gl_debug_log.cpp \
 	       $(NATIVEDIR)/gfx/texture_atlas.cpp \
@@ -313,10 +314,6 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
 	       $(NATIVEDIR)/gfx_es2/glsl_program.cpp \
 	       $(NATIVEDIR)/image/zim_load.cpp \
 	       $(NATIVEDIR)/image/png_load.cpp \
-	       $(NATIVEDIR)/math/curves.cpp \
-	       $(NATIVEDIR)/math/expression_parser.cpp \
-	       $(NATIVEDIR)/math/lin/matrix4x4.cpp \
-          $(NATIVEDIR)/math/lin/vec3.cpp \
 	       $(NATIVEDIR)/net/http_client.cpp \
 	       $(NATIVEDIR)/net/resolve.cpp \
 	       $(NATIVEDIR)/net/url.cpp \

libretro/libretro.cpp

@@ -22,7 +22,7 @@
 #include "LogManager.h"
 #include "ConsoleListener.h"
 #include "Common/File/VFS/VFS.h"
-#include "file/zip_read.h"
+#include "Common/File/VFS/AssetReader.h"
 #include "GPU/GPUState.h"
 #include "GPU/GPUInterface.h"
 #include "GPU/Common/FramebufferManagerCommon.h"