Browse Source
Merge pull request #8730 from lat9nq/fmt-9.0.0
vcpkg,yuzu: Update to fmt 9.0.0
pull/15/merge
liamwhite
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
10 additions and
5 deletions
-
externals/vcpkg
-
src/yuzu/bootmanager.cpp
-
src/yuzu/main.cpp
-
vcpkg.json
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit cef0b3ec767df6e83806899fe9525f6cf8d7bc91 |
|
|
|
Subproject commit 9b22b40c6c61bf0da2d46346dd44a11e90972cc9 |
|
|
|
@ -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()); |
|
|
|
|
|
|
|
@ -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); |
|
|
|
|
|
|
|
@ -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" |
|
|
|
} |
|
|
|
] |
|
|
|
} |