From 9888de25fe14487ec2ca7d2d92c41c4c25f9c037 Mon Sep 17 00:00:00 2001 From: LC Date: Tue, 21 Jul 2026 08:57:16 -0400 Subject: [PATCH] Externals: Update fmt to 12.2.0 Keeps fmt up to date. --- .github/workflows/steamrt4.yml | 2 +- External/fmt | 2 +- FEXCore/include/FEXCore/fextl/fmt.h | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/steamrt4.yml b/.github/workflows/steamrt4.yml index cd6fd5ae4..ce3da7391 100644 --- a/.github/workflows/steamrt4.yml +++ b/.github/workflows/steamrt4.yml @@ -43,7 +43,7 @@ jobs: distrobox upgrade steamrt4 distrobox enter --name steamrt4 -- sudo apt-get install -y \ git cmake ninja-build ccache \ - lld clang \ + lld clang clang-tools \ libclang-dev llvm-dev \ libstdc++-14-dev-i386-cross libgcc-14-dev-i386-cross \ libstdc++-14-dev-amd64-cross libgcc-14-dev-amd64-cross diff --git a/External/fmt b/External/fmt index 407c905e4..1be298e1b 160000 --- a/External/fmt +++ b/External/fmt @@ -1 +1 @@ -Subproject commit 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f +Subproject commit 1be298e1bd68957e4cd352e1f676f00e07dcfb57 diff --git a/FEXCore/include/FEXCore/fextl/fmt.h b/FEXCore/include/FEXCore/fextl/fmt.h index 9c94df2de..55c6e93f9 100644 --- a/FEXCore/include/FEXCore/fextl/fmt.h +++ b/FEXCore/include/FEXCore/fextl/fmt.h @@ -6,6 +6,7 @@ #include #include +#include #include namespace fextl::fmt { @@ -15,7 +16,7 @@ using memory_buffer = fextl::fmt::basic_memory_buffer; template OutputIt format_to(OutputIt out, ::fmt::format_string fmt, Args&&... args) { - return ::fmt::vformat_to(out, fmt.str, ::fmt::make_format_args(args...)); + return ::fmt::vformat_to(out, fmt.get(), ::fmt::make_format_args(args...)); } template @@ -35,44 +36,44 @@ FMT_INLINE fextl::string vformat(::fmt::string_view fmt, ::fmt::format_args args template FMT_NODISCARD FMT_INLINE auto format(::fmt::format_string fmt, T&&... args) -> fextl::string { - return fextl::fmt::vformat(fmt, ::fmt::make_format_args(args...)); + return fextl::fmt::vformat(fmt.get(), ::fmt::make_format_args(args...)); } #ifndef _WIN32 template FMT_INLINE auto print(::fmt::format_string fmt, T&&... args) -> void { - auto String = fextl::fmt::vformat(fmt, ::fmt::make_format_args(args...)); + auto String = fextl::fmt::vformat(fmt.get(), ::fmt::make_format_args(args...)); write(STDOUT_FILENO, String.c_str(), String.size()); } template FMT_INLINE auto print(int FD, ::fmt::format_string fmt, T&&... args) -> void { - auto String = fextl::fmt::vformat(fmt, ::fmt::make_format_args(args...)); + auto String = fextl::fmt::vformat(fmt.get(), ::fmt::make_format_args(args...)); write(FD, String.c_str(), String.size()); } #else template FMT_INLINE auto print(::fmt::format_string fmt, T&&... args) -> void { - auto String = fextl::fmt::vformat(fmt, ::fmt::make_format_args(args...)); + auto String = fextl::fmt::vformat(fmt.get(), ::fmt::make_format_args(args...)); auto f = FEXCore::File::File::GetStdOUT(); f.Write(String.c_str(), String.size()); } template FMT_INLINE auto print(HANDLE File, ::fmt::format_string fmt, T&&... args) -> void { - auto String = fextl::fmt::vformat(fmt, ::fmt::make_format_args(args...)); + auto String = fextl::fmt::vformat(fmt.get(), ::fmt::make_format_args(args...)); WriteFile(File, String.c_str(), String.size(), nullptr, nullptr); } #endif template FMT_INLINE auto print(FEXCore::File::File& f, ::fmt::format_string fmt, T&&... args) -> void { - auto String = fextl::fmt::vformat(fmt, ::fmt::make_format_args(args...)); + auto String = fextl::fmt::vformat(fmt.get(), ::fmt::make_format_args(args...)); f.Write(String.c_str(), String.size()); } template FMT_INLINE auto print(std::FILE* f, ::fmt::format_string fmt, T&&... args) -> void { - auto String = fextl::fmt::vformat(fmt, ::fmt::make_format_args(args...)); + auto String = fextl::fmt::vformat(fmt.get(), ::fmt::make_format_args(args...)); write(fileno(f), String.c_str(), String.size()); } } // namespace fextl::fmt