summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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 {
1089 } 1089 }
1090 1090
1091 if (!unsupported_ext.empty()) { 1091 if (!unsupported_ext.empty()) {
1092 LOG_ERROR(Frontend, "GPU does not support all required extensions: {}", 1092 const std::string gl_renderer{reinterpret_cast<const char*>(glGetString(GL_RENDERER))};
1093 glGetString(GL_RENDERER)); 1093 LOG_ERROR(Frontend, "GPU does not support all required extensions: {}", gl_renderer);
1094 } 1094 }
1095 for (const QString& ext : unsupported_ext) { 1095 for (const QString& ext : unsupported_ext) {
1096 LOG_ERROR(Frontend, "Unsupported GL extension: {}", ext.toStdString()); 1096 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() {
3338 } 3338 }
3339 const auto origin = config_dir_fs_path / filename; 3339 const auto origin = config_dir_fs_path / filename;
3340 const auto destination = config_dir_fs_path / "custom" / filename; 3340 const auto destination = config_dir_fs_path / "custom" / filename;
3341 LOG_INFO(Frontend, "Migrating config file from {} to {}", origin, destination); 3341 LOG_INFO(Frontend, "Migrating config file from {} to {}", origin.string(),
3342 destination.string());
3342 if (!Common::FS::RenameFile(origin, destination)) { 3343 if (!Common::FS::RenameFile(origin, destination)) {
3343 // Delete the old config file if one already exists in the new location. 3344 // Delete the old config file if one already exists in the new location.
3344 Common::FS::RemoveFile(origin); 3345 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 @@
1{ 1{
2 "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", 2 "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
3 "name": "yuzu", 3 "name": "yuzu",
4 "builtin-baseline": "cef0b3ec767df6e83806899fe9525f6cf8d7bc91", 4 "builtin-baseline": "9b22b40c6c61bf0da2d46346dd44a11e90972cc9",
5 "version": "1.0", 5 "version": "1.0",
6 "dependencies": [ 6 "dependencies": [
7 "boost-algorithm", 7 "boost-algorithm",
@@ -37,6 +37,10 @@
37 { 37 {
38 "name": "catch2", 38 "name": "catch2",
39 "version": "2.13.9" 39 "version": "2.13.9"
40 },
41 {
42 "name": "fmt",
43 "version": "9.0.0"
40 } 44 }
41 ] 45 ]
42} 46}