diff options
author | Zephyron <zephyron@citron-emu.orgq> | 2025-02-16 13:38:05 +1000 |
---|---|---|
committer | Zephyron <zephyron@citron-emu.orgq> | 2025-02-16 13:38:05 +1000 |
commit | 7730d14b4a267c9579636a18af73d4252385e15f (patch) | |
tree | e7deef63da5ae4605a1c5098d26253953b73d067 /src/core | |
parent | 677b8f476a94ec1b42d9ba1b0eeb17a3a5859133 (diff) |
build: upgrade fmt and SDL2
Update fmt library to version 11.0.2 and make necessary adjustments:
- Replace fmt/format.h includes with fmt/ranges.h
- Add const qualifiers to formatter::format functions
- Update CMake to require fmt version 11
Additional dependency updates:
- Update SDL2 bundled version from 2.28.2 to 2.32.0
- Update catch2 to version 3.8.0
- Update vcpkg baseline to c82f74667287d3dc386bce81e44964370c91a289
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/arm/dynarmic/dynarmic_cp15.cpp | 4 | ||||
-rw-r--r-- | src/core/crypto/key_manager.h | 2 | ||||
-rw-r--r-- | src/core/debugger/gdbstub.cpp | 1 | ||||
-rw-r--r-- | src/core/file_sys/bis_factory.cpp | 2 | ||||
-rw-r--r-- | src/core/file_sys/fs_save_data_types.h | 2 | ||||
-rw-r--r-- | src/core/file_sys/system_archive/ng_word.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/acc/profile_manager.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/ldn/ldn_types.h | 2 | ||||
-rw-r--r-- | src/core/hle/service/nfc/common/device.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/nvdrv.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/psc/time/common.h | 10 | ||||
-rw-r--r-- | src/core/hle/service/service.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/sockets/bsd.cpp | 2 | ||||
-rw-r--r-- | src/core/perf_stats.cpp | 2 | ||||
-rw-r--r-- | src/core/reporter.cpp | 2 |
16 files changed, 21 insertions, 20 deletions
diff --git a/src/core/arm/dynarmic/dynarmic_cp15.cpp b/src/core/arm/dynarmic/dynarmic_cp15.cpp index f3eee0d42..c663adda1 100644 --- a/src/core/arm/dynarmic/dynarmic_cp15.cpp +++ b/src/core/arm/dynarmic/dynarmic_cp15.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2017 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/logging/log.h" #include "core/arm/dynarmic/arm_dynarmic_32.h" #include "core/arm/dynarmic/dynarmic_cp15.h" @@ -22,7 +22,7 @@ struct fmt::formatter<Dynarmic::A32::CoprocReg> { return ctx.begin(); } template <typename FormatContext> - auto format(const Dynarmic::A32::CoprocReg& reg, FormatContext& ctx) { + auto format(const Dynarmic::A32::CoprocReg& reg, FormatContext& ctx) const { return fmt::format_to(ctx.out(), "cp{}", static_cast<size_t>(reg)); } }; diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h index 2250eccec..7de21f8a4 100644 --- a/src/core/crypto/key_manager.h +++ b/src/core/crypto/key_manager.h @@ -11,7 +11,7 @@ #include <string> #include <variant> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_funcs.h" #include "common/common_types.h" #include "core/crypto/partition_data_manager.h" diff --git a/src/core/debugger/gdbstub.cpp b/src/core/debugger/gdbstub.cpp index 80091cc7e..34b0b7d2b 100644 --- a/src/core/debugger/gdbstub.cpp +++ b/src/core/debugger/gdbstub.cpp @@ -9,6 +9,7 @@ #include <thread> #include <boost/algorithm/string.hpp> +#include <fmt/ranges.h> #include "common/hex_util.h" #include "common/logging/log.h" diff --git a/src/core/file_sys/bis_factory.cpp b/src/core/file_sys/bis_factory.cpp index 350d0ce29..353171974 100644 --- a/src/core/file_sys/bis_factory.cpp +++ b/src/core/file_sys/bis_factory.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/fs/path_util.h" #include "core/file_sys/bis_factory.h" #include "core/file_sys/registered_cache.h" diff --git a/src/core/file_sys/fs_save_data_types.h b/src/core/file_sys/fs_save_data_types.h index 493dba34f..fbb1b5421 100644 --- a/src/core/file_sys/fs_save_data_types.h +++ b/src/core/file_sys/fs_save_data_types.h @@ -4,7 +4,7 @@ #pragma once #include <array> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_funcs.h" #include "common/common_types.h" diff --git a/src/core/file_sys/system_archive/ng_word.cpp b/src/core/file_sys/system_archive/ng_word.cpp index 1fa67877d..a647e19ea 100644 --- a/src/core/file_sys/system_archive/ng_word.cpp +++ b/src/core/file_sys/system_archive/ng_word.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" #include "core/file_sys/system_archive/ng_word.h" #include "core/file_sys/vfs/vfs_vector.h" diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 292414f96..539f71c88 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -4,7 +4,7 @@ #include <cstring> #include <random> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/fs/file.h" #include "common/fs/fs.h" diff --git a/src/core/hle/service/ldn/ldn_types.h b/src/core/hle/service/ldn/ldn_types.h index 6198aa07b..fa0cdcbfa 100644 --- a/src/core/hle/service/ldn/ldn_types.h +++ b/src/core/hle/service/ldn/ldn_types.h @@ -3,7 +3,7 @@ #pragma once -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_funcs.h" #include "common/common_types.h" diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index 1b898672e..0af613e2a 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -14,7 +14,7 @@ #pragma warning(pop) #endif -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/fs/file.h" #include "common/fs/fs.h" diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 0265d55f2..7a035cd2c 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -6,7 +6,7 @@ #include <cstdlib> #include <cstring> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/assert.h" #include "common/logging/log.h" #include "common/scope_exit.h" diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 03eb507b9..8c618ca25 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -4,7 +4,7 @@ #include <utility> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "core/core.h" #include "core/hle/kernel/k_event.h" #include "core/hle/service/ipc_helpers.h" diff --git a/src/core/hle/service/psc/time/common.h b/src/core/hle/service/psc/time/common.h index 3e13144a0..d6e3e27ea 100644 --- a/src/core/hle/service/psc/time/common.h +++ b/src/core/hle/service/psc/time/common.h @@ -5,7 +5,7 @@ #include <array> #include <chrono> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/common_types.h" #include "common/intrusive_list.h" @@ -167,7 +167,7 @@ constexpr inline Result GetSpanBetweenTimePoints(s64* out_seconds, const SteadyC template <> struct fmt::formatter<Service::PSC::Time::TimeType> : fmt::formatter<fmt::string_view> { template <typename FormatContext> - auto format(Service::PSC::Time::TimeType type, FormatContext& ctx) { + auto format(Service::PSC::Time::TimeType type, FormatContext& ctx) const { const string_view name = [type] { using Service::PSC::Time::TimeType; switch (type) { @@ -180,7 +180,7 @@ struct fmt::formatter<Service::PSC::Time::TimeType> : fmt::formatter<fmt::string } return "Invalid"; }(); - return formatter<string_view>::format(name, ctx); + return fmt::formatter<string_view>::format(name, ctx); } }; @@ -228,7 +228,7 @@ template <> struct fmt::formatter<Service::PSC::Time::LocationName> : fmt::formatter<fmt::string_view> { template <typename FormatContext> auto format(const Service::PSC::Time::LocationName& name, FormatContext& ctx) const { - return formatter<string_view>::format(name.data(), ctx); + return fmt::formatter<string_view>::format(name.data(), ctx); } }; @@ -236,7 +236,7 @@ template <> struct fmt::formatter<Service::PSC::Time::RuleVersion> : fmt::formatter<fmt::string_view> { template <typename FormatContext> auto format(const Service::PSC::Time::RuleVersion& version, FormatContext& ctx) const { - return formatter<string_view>::format(version.data(), ctx); + return fmt::formatter<string_view>::format(version.data(), ctx); } }; diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index ce5e3b5b4..deeea16ae 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/assert.h" #include "common/logging/log.h" #include "common/settings.h" diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index dd652ca42..ef0320334 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -6,7 +6,7 @@ #include <utility> #include <vector> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/microprofile.h" #include "common/socket_types.h" diff --git a/src/core/perf_stats.cpp b/src/core/perf_stats.cpp index 957be9614..770dffecb 100644 --- a/src/core/perf_stats.cpp +++ b/src/core/perf_stats.cpp @@ -9,7 +9,7 @@ #include <sstream> #include <thread> #include <fmt/chrono.h> -#include <fmt/format.h> +#include <fmt/ranges.h> #include "common/fs/file.h" #include "common/fs/fs.h" #include "common/fs/path_util.h" diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp index 424bb63c7..a2627b5e2 100644 --- a/src/core/reporter.cpp +++ b/src/core/reporter.cpp @@ -6,7 +6,7 @@ #include <iomanip> #include <fmt/chrono.h> -#include <fmt/format.h> +#include <fmt/ranges.h> #include <nlohmann/json.hpp> #include "common/fs/file.h" |