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
This commit is contained in:
Zephyron 2025-02-16 13:38:05 +10:00
parent 677b8f476a
commit 7730d14b4a
77 changed files with 111 additions and 110 deletions

View file

@ -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));
}
};

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -3,7 +3,7 @@
#pragma once
#include <fmt/format.h>
#include <fmt/ranges.h>
#include "common/common_funcs.h"
#include "common/common_types.h"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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);
}
};

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"