From 4afaa63591dd06ce436a1e2cc73f6bbff36cb68b Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Fri, 5 Jan 2024 23:19:16 +0100
Subject: [PATCH] Added Dir and FileAcces to the amalgamated builds.

---
 tools/merger/sfw_core.cpp.inl | 12 ++++++++++++
 tools/merger/sfw_core.h.inl   | 13 +++++++++++++
 tools/merger/sfw_full.cpp.inl | 14 ++++++++++++++
 tools/merger/sfw_full.h.inl   | 13 +++++++++++++
 4 files changed, 52 insertions(+)

diff --git a/tools/merger/sfw_core.cpp.inl b/tools/merger/sfw_core.cpp.inl
index 0d360d9..ba0a3b8 100644
--- a/tools/merger/sfw_core.cpp.inl
+++ b/tools/merger/sfw_core.cpp.inl
@@ -181,3 +181,15 @@
 //--STRIP
 {{FILE:sfw/core/vector4.cpp}}
 
+//--STRIP
+//#include "file_access.h"
+//--STRIP
+{{FILE:sfw/core/file_access.cpp}}
+
+{{FILE:sfw/core/3rd_tinydir.h}}
+
+//--STRIP
+//#include "dir_access.h"
+//#include "3rd_tinydir.h"
+//--STRIP
+{{FILE:sfw/core/dir_access.cpp}}
diff --git a/tools/merger/sfw_core.h.inl b/tools/merger/sfw_core.h.inl
index f53c7b0..43f7642 100644
--- a/tools/merger/sfw_core.h.inl
+++ b/tools/merger/sfw_core.h.inl
@@ -387,4 +387,17 @@
 //--STRIP
 {{FILE:sfw/core/hash_set.h}}
 
+//--STRIP
+//#include "core/error_list.h"
+//#include "core/ustring.h"
+//also needs vector
+//--STRIP
+{{FILE:sfw/core/file_access.h}}
+
+//--STRIP
+//#include "core/error_list.h"
+//#include "core/ustring.h"
+//--STRIP
+{{FILE:sfw/core/dir_access.h}}
+
 #endif
diff --git a/tools/merger/sfw_full.cpp.inl b/tools/merger/sfw_full.cpp.inl
index 8f04f85..319188a 100644
--- a/tools/merger/sfw_full.cpp.inl
+++ b/tools/merger/sfw_full.cpp.inl
@@ -353,6 +353,20 @@
 //--STRIP
 {{FILE:sfw/core/vector4.cpp}}
 
+//--STRIP
+//#include "file_access.h"
+//--STRIP
+{{FILE:sfw/core/file_access.cpp}}
+
+{{FILE:sfw/core/3rd_tinydir.h}}
+
+//--STRIP
+//#include "dir_access.h"
+//#include "3rd_tinydir.h"
+//--STRIP
+{{FILE:sfw/core/dir_access.cpp}}
+
+
 //--STRIP
 //===================  OBJECT SECTION  ===================
 //--STRIP
diff --git a/tools/merger/sfw_full.h.inl b/tools/merger/sfw_full.h.inl
index 4777785..299919d 100644
--- a/tools/merger/sfw_full.h.inl
+++ b/tools/merger/sfw_full.h.inl
@@ -387,6 +387,19 @@
 //--STRIP
 {{FILE:sfw/core/hash_set.h}}
 
+//--STRIP
+//#include "core/error_list.h"
+//#include "core/ustring.h"
+//also needs vector
+//--STRIP
+{{FILE:sfw/core/file_access.h}}
+
+//--STRIP
+//#include "core/error_list.h"
+//#include "core/ustring.h"
+//--STRIP
+{{FILE:sfw/core/dir_access.h}}
+
 //--STRIP
 //===================  OBJECT SECTION  ===================
 //--STRIP