From 580cb1c60afd5543f4202e126ffef663b267cfae Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 13 Jul 2021 08:40:56 +0200 Subject: [PATCH] early-access version 1874 --- README.md | 2 +- src/core/file_sys/content_archive.cpp | 1 - src/core/hle/service/bcat/backend/boxcat.cpp | 3 +++ src/input_common/main.cpp | 4 ++-- src/web_service/web_backend.cpp | 10 ++++++++++ src/yuzu/main.cpp | 6 ++++-- 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 03e5221d5..2d1ed838a 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 1873. +This is the source code for early-access 1874. ## Legal Notice diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index 24eff210f..7019a7a68 100755 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include "common/logging/log.h" diff --git a/src/core/hle/service/bcat/backend/boxcat.cpp b/src/core/hle/service/bcat/backend/boxcat.cpp index dc15cf58b..7ca7f2aac 100755 --- a/src/core/hle/service/bcat/backend/boxcat.cpp +++ b/src/core/hle/service/bcat/backend/boxcat.cpp @@ -7,6 +7,9 @@ #ifdef __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" +#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif #endif #include #include diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index 7399c3648..8de3d4520 100755 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp @@ -294,8 +294,8 @@ void InputSubsystem::ReloadInputDevices() { impl->udp->ReloadSockets(); } -std::vector> InputSubsystem::GetPollers( - Polling::DeviceType type) const { +std::vector> InputSubsystem::GetPollers([ + [maybe_unused]] Polling::DeviceType type) const { #ifdef HAVE_SDL2 return impl->sdl->GetPollers(type); #else diff --git a/src/web_service/web_backend.cpp b/src/web_service/web_backend.cpp index e04f7dfc6..b1e02c57a 100755 --- a/src/web_service/web_backend.cpp +++ b/src/web_service/web_backend.cpp @@ -8,7 +8,17 @@ #include #include + +#ifdef __GNUC__ +#pragma GCC diagnostic push +#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif +#endif #include +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif #include "common/logging/log.h" #include "web_service/web_backend.h" diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 9cff0fdf9..17087dc2e 100755 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1417,8 +1417,10 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t std::filesystem::path{filename.toStdU16String()}.filename()); } const bool is_64bit = system.Kernel().CurrentProcess()->Is64BitProcess(); - const auto instruction_set_suffix = is_64bit ? " (64-bit)" : " (32-bit)"; - title_name += instruction_set_suffix; + const auto instruction_set_suffix = is_64bit ? tr("(64-bit)") : tr("(32-bit)"); + title_name = tr("%1 %2", "%1 is the title name. %2 indicates if the title is 64-bit or 32-bit") + .arg(QString::fromStdString(title_name), instruction_set_suffix) + .toStdString(); LOG_INFO(Frontend, "Booting game: {:016X} | {} | {}", title_id, title_name, title_version); const auto gpu_vendor = system.GPU().Renderer().GetDeviceVendor(); UpdateWindowTitle(title_name, title_version, gpu_vendor);