From 7730d14b4a267c9579636a18af73d4252385e15f Mon Sep 17 00:00:00 2001 From: Zephyron Date: Sun, 16 Feb 2025 13:38:05 +1000 Subject: 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 --- src/core/hle/service/acc/profile_manager.cpp | 2 +- src/core/hle/service/ldn/ldn_types.h | 2 +- src/core/hle/service/nfc/common/device.cpp | 2 +- src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 2 +- src/core/hle/service/nvdrv/nvdrv.cpp | 2 +- src/core/hle/service/psc/time/common.h | 10 +++++----- src/core/hle/service/service.cpp | 2 +- src/core/hle/service/sockets/bsd.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/core/hle') 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 #include -#include +#include #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 +#include #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 +#include #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 #include -#include +#include #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 -#include +#include #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 #include -#include +#include #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 : fmt::formatter { template - 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 : fmt::formatter::format(name, ctx); + return fmt::formatter::format(name, ctx); } }; @@ -228,7 +228,7 @@ template <> struct fmt::formatter : fmt::formatter { template auto format(const Service::PSC::Time::LocationName& name, FormatContext& ctx) const { - return formatter::format(name.data(), ctx); + return fmt::formatter::format(name.data(), ctx); } }; @@ -236,7 +236,7 @@ template <> struct fmt::formatter : fmt::formatter { template auto format(const Service::PSC::Time::RuleVersion& version, FormatContext& ctx) const { - return formatter::format(version.data(), ctx); + return fmt::formatter::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 +#include #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 #include -#include +#include #include "common/microprofile.h" #include "common/socket_types.h" -- cgit v1.2.3