summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar David2019-09-21 23:46:58 +1000
committerGravatar GitHub2019-09-21 23:46:58 +1000
commit97b8c9d2c380f11c41b038b6e16466f1fe95526f (patch)
treec17297f338a69d6a5e3fbec56d5807a77b6bdf35
parentMerge pull request #2806 from FearlessTobi/port-4882 (diff)
parentAdded Host CPU and OS to log (diff)
downloadyuzu-97b8c9d2c380f11c41b038b6e16466f1fe95526f.tar.gz
yuzu-97b8c9d2c380f11c41b038b6e16466f1fe95526f.tar.xz
yuzu-97b8c9d2c380f11c41b038b6e16466f1fe95526f.zip
Merge pull request #2885 from Hexagon12/port-4944
Port citra-emu/citra#4944: "Added Host CPU and OS to log"
-rw-r--r--src/yuzu/main.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 8304c6517..1dcfac258 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -54,6 +54,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
54#include <QProgressDialog> 54#include <QProgressDialog>
55#include <QShortcut> 55#include <QShortcut>
56#include <QStatusBar> 56#include <QStatusBar>
57#include <QSysInfo>
57#include <QtConcurrent/QtConcurrent> 58#include <QtConcurrent/QtConcurrent>
58 59
59#include <fmt/format.h> 60#include <fmt/format.h>
@@ -66,6 +67,9 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
66#include "common/microprofile.h" 67#include "common/microprofile.h"
67#include "common/scm_rev.h" 68#include "common/scm_rev.h"
68#include "common/scope_exit.h" 69#include "common/scope_exit.h"
70#ifdef ARCHITECTURE_x86_64
71#include "common/x64/cpu_detect.h"
72#endif
69#include "common/telemetry.h" 73#include "common/telemetry.h"
70#include "core/core.h" 74#include "core/core.h"
71#include "core/crypto/key_manager.h" 75#include "core/crypto/key_manager.h"
@@ -205,6 +209,10 @@ GMainWindow::GMainWindow()
205 209
206 LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, 210 LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
207 Common::g_scm_desc); 211 Common::g_scm_desc);
212#ifdef ARCHITECTURE_x86_64
213 LOG_INFO(Frontend, "Host CPU: {}", Common::GetCPUCaps().cpu_string);
214#endif
215 LOG_INFO(Frontend, "Host OS: {}", QSysInfo::prettyProductName().toStdString());
208 UpdateWindowTitle(); 216 UpdateWindowTitle();
209 217
210 show(); 218 show();