amalgamation fixes #67

Job	Run time
Test Amalgamation	18s
build / Win MSVC Latest \| Static Lib (MT) \| ANSI \| LTO ON \| Single-thread \| Vcpkg \| RTC1	2m 4s
build / Win MinGW \| Static Lib \| Unicode \| Single-thread \| LTO ON \| FetchContent	1m 43s
build / Linux GCC \| Shared Lib \| Unicode \| Multi-thread \| LTO OFF \| Vcpkg	27s
build / Win MSVC 2022 \| Shared Lib (MTd) \| ANSI \| LTO OFF \| Single-thread \| FetchContent \| RTCs	1m 30s
build / Linux GCC \| Static Lib \| ANSI \| Single-thread \| LTO ON \| FetchContent	23s
build / Win Cygwin \| Static Lib \| Unicode \| Single-thread \| LTO OFF \| FetchContent	3m 16s
build / Win MSVC Latest \| Shared Lib (MD) \| Unicode \| LTO OFF \| Multi-thread \| FetchContent	1m 18s
build / Win MinGW \| Shared Lib \| ANSI \| Multi-thread \| LTO OFF \| System	1m 29s
build / Linux Clang \| Shared Lib \| Unicode \| Multi-thread \| LTO OFF \| Vcpkg	32s
build / Linux Clang \| Static Lib \| ANSI \| Single-thread \| LTO ON \| System	32s
build / Win MSVC Latest \| Static Lib (MDd) \| Unicode \| LTO OFF \| Multi-thread \| System \| RTCu	2m 0s
build / macOS Clang \| Static Lib \| ANSI \| Single-thread \| LTO OFF \| System	27s
build / macOS Clang \| Shared Lib \| Unicode \| Multi-thread \| LTO ON \| FetchContent	30s
	16m 29s

Provide feedback