From 3614947989de0cc8f341fe501e0f0960e510392d Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 5 Jan 2024 22:35:05 +0100 Subject: [PATCH] Created core only merger templates. --- tools/merger/join.sh | 6 +- tools/merger/sfw_core.cpp.inl | 183 ++++++++++++++++ tools/merger/sfw_core.h.inl | 390 ++++++++++++++++++++++++++++++++++ 3 files changed, 578 insertions(+), 1 deletion(-) create mode 100644 tools/merger/sfw_core.cpp.inl create mode 100644 tools/merger/sfw_core.h.inl diff --git a/tools/merger/join.sh b/tools/merger/join.sh index 9bceb3b..8cc519c 100755 --- a/tools/merger/join.sh +++ b/tools/merger/join.sh @@ -1,11 +1,15 @@ mkdir -p out + +mkdir -p out/core mkdir -p out/full cd .. cd .. +python tools/merger/join.py --template tools/merger/sfw_core.h.inl --path . --output tools/merger/out/core/sfw.h +python tools/merger/join.py --template tools/merger/sfw_core.cpp.inl --path . --output tools/merger/out/core/sfw.cpp + python tools/merger/join.py --template tools/merger/sfw_full.h.inl --path . --output tools/merger/out/full/sfw.h python tools/merger/join.py --template tools/merger/sfw_full.cpp.inl --path . --output tools/merger/out/full/sfw.cpp python tools/merger/join.py --template tools/merger/sfw_3rd_full.x.inl --path . --output tools/merger/out/full/sfw_3rd.h - diff --git a/tools/merger/sfw_core.cpp.inl b/tools/merger/sfw_core.cpp.inl new file mode 100644 index 0000000..0d360d9 --- /dev/null +++ b/tools/merger/sfw_core.cpp.inl @@ -0,0 +1,183 @@ + + +{{FILEINLINE:tools/merger/sfw_readme.inl.h}} +{{FILEINLINE:tools/merger/sfw_linceses.inl.h}} + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef SFW_H +#include "sfw.h" +#endif + +{{FILE:sfw/core/ucaps.h}} + +//--STRIP +//#include "core/mutex.h" +//--STRIP +{{FILE:sfw/core/mutex.cpp}} +//--STRIP +//#if defined(DEBUG_ENABLED) && !defined(NO_THREADS) +//#include "core/safe_refcount.h" +//#include "core/error/error_macros.h" +//--STRIP +{{FILE:sfw/core/safe_refcount.cpp}} + +//--STRIP +//#include "core/stime.h" +//--STRIP +{{FILE:sfw/core/stime.cpp}} + +//--STRIP +//#include "core/memory.h" +//#include "core/error_macros.h" +//#include "core/safe_refcount.h" +//--STRIP +{{FILE:sfw/core/memory.cpp}} +//--STRIP +//{//{//FILE:sfw/core/old/directory.cpp}} +//--STRIP + +//--STRIP +//#include "core/pool_vector.h" +//--STRIP +{{FILE:sfw/core/pool_vector.cpp}} +//--STRIP +//#include "pool_allocator.h" +//#include "core/error_macros.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/pool_allocator.cpp}} + +//--STRIP +//#include "core/random_pcg.h" +//#include "core/stime.h" +//#include "core/error_macros.h" +//--STRIP +{{FILE:sfw/core/random_pcg.cpp}} + +//--STRIP +//#include "core/math_funcs.h" +//#include "core/error_macros.h" +//--STRIP +{{FILE:sfw/core/math_funcs.cpp}} + +//--STRIP +//#include "core/ustring.h" +//#include "core/color.h" +//#include "core/math_funcs.h" +//#include "core/memory.h" +//#include "ucaps.h" +//--STRIP +{{FILE:sfw/core/ustring.cpp}} +//--STRIP +//#include "core/logger.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/logger.cpp}} +//--STRIP +//#include "core/string_name.h" +//--STRIP +{{FILE:sfw/core/string_name.cpp}} + +//--STRIP +//#include "core/aabb.h" +//--STRIP +{{FILE:sfw/core/aabb.cpp}} +//--STRIP +//#include "core/vector3i.h" +//#include "core/vector3.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/vector3i.cpp}} +//--STRIP +//#include "core/transform_2d.h" +//--STRIP +{{FILE:sfw/core/transform_2d.cpp}} +//--STRIP +//#include "core/projection.h" +//#include "core/aabb.h" +//#include "core/math_funcs.h" +//#include "core/plane.h" +//#include "core/rect2.h" +//#include "core/transform.h" +//--STRIP +{{FILE:sfw/core/projection.cpp}} +//--STRIP +//#include "core/vector3.h" +//#include "core/basis.h" +//--STRIP +{{FILE:sfw/core/vector3.cpp}} +//--STRIP +//#include "core/pcg.h" +//--STRIP +{{FILE:sfw/core/pcg.cpp}} +//--STRIP +//#include "core/vector2.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/vector2.cpp}} +//--STRIP +//#include "core/basis.h" +//#include "core/math_funcs.h" +//--STRIP +{{FILE:sfw/core/basis.cpp}} +//--STRIP +//#include "face3.h" +//--STRIP +{{FILE:sfw/core/face3.cpp}} +//--STRIP +//#include "core/vector4i.h" +//#include "core/vector4.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/vector4i.cpp}} +//--STRIP +//#include "core/transform.h" +//#include "core/math_funcs.h" +//--STRIP +{{FILE:sfw/core/transform.cpp}} +//--STRIP +//#include "core/color.h" +//#include "core/math_funcs.h" +//--STRIP +{{FILE:sfw/core/color.cpp}} +//--STRIP +//#include "core/quaternion.h" +//#include "core/basis.h" +//--STRIP +{{FILE:sfw/core/quaternion.cpp}} +//--STRIP +//#include "core/plane.h" +//#include "core/math_funcs.h" +//--STRIP +{{FILE:sfw/core/plane.cpp}} +//--STRIP +//#include "core/vector2i.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/vector2i.cpp}} +//--STRIP +//#include "core/transform_2d.h" // Includes rect2.h but Rect2 needs Transform2D +//#include "core/rect2i.h" +//--STRIP +{{FILE:sfw/core/rect2.cpp}} +//--STRIP +//#include "core/transform_2d.h" // Includes rect2.h but Rect2 needs Transform2D +//--STRIP +{{FILE:sfw/core/rect2i.cpp}} +//--STRIP +//#include "core/vector4.h" +//#include "core/basis.h" +//--STRIP +{{FILE:sfw/core/vector4.cpp}} + diff --git a/tools/merger/sfw_core.h.inl b/tools/merger/sfw_core.h.inl new file mode 100644 index 0000000..f53c7b0 --- /dev/null +++ b/tools/merger/sfw_core.h.inl @@ -0,0 +1,390 @@ +#ifndef SFW_H +#define SFW_H + +{{FILEINLINE:tools/merger/sfw_readme.inl.h}} +{{FILEINLINE:tools/merger/sfw_linceses.inl.h}} + +#define _REENTRANT + +#include +#include +#include +#include + +//--STRIP +//no includes +//--STRIP +{{FILE:sfw/core/int_types.h}} +//--STRIP +//no includes +//--STRIP +{{FILE:sfw/core/math_defs.h}} +//--STRIP +//no includes +//--STRIP +{{FILE:sfw/core/error_list.h}} +//--STRIP +//no includes +//--STRIP +{{FILE:sfw/core/logger.h}} + +//--STRIP +//#include "core/int_types.h" +//#include "core/error_list.h" +//--STRIP +{{FILE:sfw/core/typedefs.h}} + + +//--STRIP +//#include "core/int_types.h" +//--STRIP +{{FILE:sfw/core/stime.h}} +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/safe_refcount.h}} + +//--STRIP +//#include "core/logger.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/error_macros.h}} + + +//--STRIP +//#include "core/error_macros.h" +//#include "core/safe_refcount.h" +//--STRIP +{{FILE:sfw/core/memory.h}} + + +//--STRIP +//#include "core/error_list.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/mutex.h}} +//--STRIP +//#include "core/error_list.h" +//--STRIP +{{FILE:sfw/core/rw_lock.h}} +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/spin_lock.h}} +//--STRIP +//#include "core/mutex.h" +//--STRIP +{{FILE:sfw/core/thread_safe.h}} + +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/pcg.h}} +//--STRIP +//#include "core/math_defs.h" +//#include "core/pcg.h" +//--STRIP +{{FILE:sfw/core/random_pcg.h}} + +//--STRIP +//#include "core/error_macros.h" +//#include "core/math_defs.h" +//#include "core/random_pcg.h" +//#include "core/typedefs.h" +//#include "core/pcg.h" +//--STRIP +{{FILE:sfw/core/math_funcs.h}} + +//--STRIP +//Simple almost dependencyless containers +//--STRIP + +//--STRIP +//#include "core/error_list.h" +//#include "core/error_macros.h" +//#include "core/memory.h" +//#include "core/safe_refcount.h" +//--STRIP +{{FILE:sfw/core/cowdata.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/sort_array.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/rb_map.h}} +//--STRIP +//#include "core/memory.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/rb_set.h}} +//--STRIP +//#include "cowdata.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/vmap.h}} +//--STRIP +//#include "cowdata.h" +//#include "core/sort_array.h" +//#include "core/error_macros.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/vector.h}} +//--STRIP +//#include "core/vector.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/vset.h}} +//--STRIP +//#include "core/sort_array.h" +//#include "core/error_macros.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/list.h}} +//--STRIP +//#include "core/vector.h" +//--STRIP +{{FILE:sfw/core/ring_buffer.h}} +//--STRIP +//#include "core/memory.h" +//#include "spin_lock.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/paged_allocator.h}} +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/pool_allocator.h}} + +//--STRIP +//Strings they need vector.h, and cowdata.h +//--STRIP + +//--STRIP +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/char_range.inc}} +//--STRIP +//#include "core/typedefs.h" +//#include "core/char_range.inc" +//--STRIP +{{FILE:sfw/core/char_utils.h}} +//--STRIP +//#include "cowdata.h" +//#include "core/vector.h" +//#include "char_utils.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/ustring.h}} + +//--STRIP +//#include "core/mutex.h" +//#include "core/safe_refcount.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/string_name.h}} + +//--STRIP +//Needs ustring.h +//--STRIP + +//--STRIP +//#include "core/memory.h" +//#include "core/mutex.h" +//#include "pool_allocator.h" +//#include "rw_lock.h" +//#include "core/safe_refcount.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/pool_vector.h}} +//--STRIP +//#include "core/pool_vector.h" +//#include "core/sort_array.h" +//#include "core/vector.h" +//#include "core/error_macros.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/tight_local_vector.h}} +//--STRIP +//#include "core/pool_vector.h" +//#include "core/sort_array.h" +//#include "core/vector.h" +//#include "core/error_macros.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/local_vector.h}} + +//--STRIP +//Math classes +//--STRIP + +//--STRIP +//#include "core/math_funcs.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/color.h}} +//--STRIP +//#include "core/math_funcs.h" +//#include "core/error_macros.h" +//--STRIP +{{FILE:sfw/core/vector2.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/math_funcs.h" +//#include "core/vector2.h" +//--STRIP +{{FILE:sfw/core/vector2i.h}} +//--STRIP +//#include "core/vector2.h" // also includes math_funcs and ustring +//#include "core/vector2i.h" +//--STRIP +{{FILE:sfw/core/rect2.h}} +//--STRIP +//#include "core/vector2i.h" // also includes math_funcs and ustring +//--STRIP +{{FILE:sfw/core/rect2i.h}} +//--STRIP +//#include "core/math_funcs.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/vector3.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/math_funcs.h" +//--STRIP +{{FILE:sfw/core/vector3i.h}} +//--STRIP +//#include "core/math_defs.h" +//#include "core/math_funcs.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/vector4.h}} +//--STRIP +//#include "core/error_macros.h" +//#include "core/math_funcs.h" +//--STRIP +{{FILE:sfw/core/vector4i.h}} + +//--STRIP +//#include "core/vector3.h" +//--STRIP +{{FILE:sfw/core/plane.h}} +//--STRIP +//#include "core/math_defs.h" +//#include "core/plane.h" +//#include "core/vector3.h" +//--STRIP +{{FILE:sfw/core/aabb.h}} +//--STRIP +//#include "core/math_defs.h" +//#include "core/math_funcs.h" +//#include "core/vector3.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/quaternion.h}} +//--STRIP +//#include "core/vector.h" +//#include "core/math_defs.h" +//#include "core/vector3.h" +//#include "core/math_defs.h" +//#include "core/math_funcs.h" +//#include "core/ustring.h" +//#include "core/vector4.h" +//--STRIP +{{FILE:sfw/core/projection.h}} +//--STRIP +//#include "core/quaternion.h" +//#include "core/vector3.h" +//#include "core/vector3i.h" +//--STRIP +{{FILE:sfw/core/basis.h}} + +//--STRIP +//#include "core/pool_vector.h" +//#include "core/rect2.h" // also includes vector2, math_funcs, and ustring +//#include "core/rect2i.h" // also includes vector2i, math_funcs, and ustring +//--STRIP +{{FILE:sfw/core/transform_2d.h}} +//--STRIP +//#include "core/aabb.h" +//#include "core/plane.h" +//#include "core/transform.h" +//#include "core/vector3.h" +//--STRIP +{{FILE:sfw/core/face3.h}} +//--STRIP +//#include "core/aabb.h" +//#include "core/basis.h" +//#include "core/plane.h" +//#include "core/vector3i.h" +//#include "core/pool_vector.h" +//--STRIP +{{FILE:sfw/core/transform.h}} + +//--STRIP +//hashfuncs.h Needs most math classes +//--STRIP + +//--STRIP +//#include "core/aabb.h" +//#include "core/math_defs.h" +//#include "core/math_funcs.h" +//#include "core/rect2.h" +//#include "core/rect2i.h" +//#include "core/vector2.h" +//#include "core/vector2i.h" +//#include "core/vector3.h" +//#include "core/vector3i.h" +//#include "core/vector4.h" +//#include "core/vector4i.h" +//#include "core/string_name.h" +//#include "core/ustring.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/hashfuncs.h}} + +//--STRIP +//Containers that need hashfuncs.h +//--STRIP + +//--STRIP +//#include "core/hashfuncs.h" +//#include "core/typedefs.h" +//--STRIP +{{FILE:sfw/core/pair.h}} +//--STRIP +//#include "core/hashfuncs.h" +//#include "core/list.h" +//#include "core/error_macros.h" +//#include "core/math_funcs.h" +//#include "core/memory.h" +//#include "core/ustring.h" +//--STRIP +{{FILE:sfw/core/og_hash_map.h}} +//--STRIP +//#include "core/list.h" +//#include "core/og_hash_map.h" +//#include "core/pair.h" +//--STRIP +{{FILE:sfw/core/ordered_hash_map.h}} +//--STRIP +//#include "core/hashfuncs.h" +//#include "paged_allocator.h" +//#include "pair.h" +//#include "core/math_funcs.h" +//#include "core/memory.h" +//#include "list.h" +//--STRIP +{{FILE:sfw/core/hash_map.h}} +//--STRIP +//#include "core/hash_map.h" +//#include "core/hashfuncs.h" +//#include "core/math_funcs.h" +//#include "core/memory.h" +//--STRIP +{{FILE:sfw/core/hash_set.h}} + +#endif