daniel/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2024-12-23 07:01:20 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8730 from lat9nq/fmt-9.0.0

Browse Source 
vcpkg,yuzu: Update to fmt 9.0.0
This commit is contained in:
liamwhite 2022-08-07 19:04:24 -04:00 committed by GitHub
commit 167d948ce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/vcpkg vendored

@ -1 +1 @@
Subproject commit cef0b3ec767df6e83806899fe9525f6cf8d7bc91 Subproject commit 9b22b40c6c61bf0da2d46346dd44a11e90972cc9

4
src/yuzu/bootmanager.cpp
View File

@ -1089,8 +1089,8 @@ QStringList GRenderWindow::GetUnsupportedGLExtensions() const {
} }
if (!unsupported_ext.empty()) { if (!unsupported_ext.empty()) {
LOG_ERROR(Frontend, "GPU does not support all required extensions: {}", const std::string gl_renderer{reinterpret_cast<const char*>(glGetString(GL_RENDERER))};
glGetString(GL_RENDERER)); LOG_ERROR(Frontend, "GPU does not support all required extensions: {}", gl_renderer);
} }
for (const QString& ext : unsupported_ext) { for (const QString& ext : unsupported_ext) {
LOG_ERROR(Frontend, "Unsupported GL extension: {}", ext.toStdString()); LOG_ERROR(Frontend, "Unsupported GL extension: {}", ext.toStdString());

3
src/yuzu/main.cpp
View File

@ -3338,7 +3338,8 @@ void GMainWindow::MigrateConfigFiles() {
} }
const auto origin = config_dir_fs_path / filename; const auto origin = config_dir_fs_path / filename;
const auto destination = config_dir_fs_path / "custom" / 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)) { if (!Common::FS::RenameFile(origin, destination)) {
// Delete the old config file if one already exists in the new location. // Delete the old config file if one already exists in the new location.
Common::FS::RemoveFile(origin); Common::FS::RemoveFile(origin);

6
vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
"name": "yuzu", "name": "yuzu",
"builtin-baseline": "cef0b3ec767df6e83806899fe9525f6cf8d7bc91", "builtin-baseline": "9b22b40c6c61bf0da2d46346dd44a11e90972cc9",
"version": "1.0", "version": "1.0",
"dependencies": [ "dependencies": [
"boost-algorithm", "boost-algorithm",
@ -37,6 +37,10 @@
{ {
"name": "catch2", "name": "catch2",
"version": "2.13.9" "version": "2.13.9"
},
{
"name": "fmt",
"version": "9.0.0"
} }
] ]
} }