summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2022-08-08 01:04:24 +0200
committerGitHub <noreply@github.com>2022-08-08 01:04:24 +0200
commit167d948ce163ba55fcf7434362b7593000a1c60c (patch)
treef6536bbc4599572918b2aa4f173f5a6b5f09ac99
parentMerge pull request #8675 from merryhime/track-dynarmic-202207 (diff)
parentyuzu: Fix fmt 9.0.0 issues (diff)
downloadyuzu-167d948ce163ba55fcf7434362b7593000a1c60c.tar
yuzu-167d948ce163ba55fcf7434362b7593000a1c60c.tar.gz
yuzu-167d948ce163ba55fcf7434362b7593000a1c60c.tar.bz2
yuzu-167d948ce163ba55fcf7434362b7593000a1c60c.tar.lz
yuzu-167d948ce163ba55fcf7434362b7593000a1c60c.tar.xz
yuzu-167d948ce163ba55fcf7434362b7593000a1c60c.tar.zst
yuzu-167d948ce163ba55fcf7434362b7593000a1c60c.zip
m---------externals/vcpkg0
-rw-r--r--src/yuzu/bootmanager.cpp4
-rw-r--r--src/yuzu/main.cpp3
-rw-r--r--vcpkg.json6
4 files changed, 9 insertions, 4 deletions
diff --git a/externals/vcpkg b/externals/vcpkg
-Subproject cef0b3ec767df6e83806899fe9525f6cf8d7bc9
+Subproject 9b22b40c6c61bf0da2d46346dd44a11e90972cc
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index ef3bdfb1a..c262d0a2b 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -1089,8 +1089,8 @@ QStringList GRenderWindow::GetUnsupportedGLExtensions() const {
}
if (!unsupported_ext.empty()) {
- LOG_ERROR(Frontend, "GPU does not support all required extensions: {}",
- glGetString(GL_RENDERER));
+ const std::string gl_renderer{reinterpret_cast<const char*>(glGetString(GL_RENDERER))};
+ LOG_ERROR(Frontend, "GPU does not support all required extensions: {}", gl_renderer);
}
for (const QString& ext : unsupported_ext) {
LOG_ERROR(Frontend, "Unsupported GL extension: {}", ext.toStdString());
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index dc7b343d9..653280642 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3338,7 +3338,8 @@ void GMainWindow::MigrateConfigFiles() {
}
const auto origin = config_dir_fs_path / filename;
const auto destination = config_dir_fs_path / "custom" / filename;
- LOG_INFO(Frontend, "Migrating config file from {} to {}", origin, destination);
+ LOG_INFO(Frontend, "Migrating config file from {} to {}", origin.string(),
+ destination.string());
if (!Common::FS::RenameFile(origin, destination)) {
// Delete the old config file if one already exists in the new location.
Common::FS::RemoveFile(origin);
diff --git a/vcpkg.json b/vcpkg.json
index b247f7386..c4413e22a 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
"name": "yuzu",
- "builtin-baseline": "cef0b3ec767df6e83806899fe9525f6cf8d7bc91",
+ "builtin-baseline": "9b22b40c6c61bf0da2d46346dd44a11e90972cc9",
"version": "1.0",
"dependencies": [
"boost-algorithm",
@@ -37,6 +37,10 @@
{
"name": "catch2",
"version": "2.13.9"
+ },
+ {
+ "name": "fmt",
+ "version": "9.0.0"
}
]
}