Merge pull request #9289 from liamwhite/fruit-company
general: fix compile for Apple Clang
This commit is contained in:
commit
22aff09b33
79 changed files with 952 additions and 37 deletions
|
@ -2850,6 +2850,7 @@ void GMainWindow::ErrorDisplayDisplayError(QString error_code, QString error_tex
|
|||
}
|
||||
|
||||
void GMainWindow::OnMenuReportCompatibility() {
|
||||
#if defined(ARCHITECTURE_x86_64) && !defined(__APPLE__)
|
||||
const auto& caps = Common::GetCPUCaps();
|
||||
const bool has_fma = caps.fma || caps.fma4;
|
||||
const auto processor_count = std::thread::hardware_concurrency();
|
||||
|
@ -2876,6 +2877,11 @@ void GMainWindow::OnMenuReportCompatibility() {
|
|||
"> "
|
||||
"Web."));
|
||||
}
|
||||
#else
|
||||
QMessageBox::critical(this, tr("Hardware requirements not met"),
|
||||
tr("Your system does not meet the recommended hardware requirements. "
|
||||
"Compatibility reporting has been disabled."));
|
||||
#endif
|
||||
}
|
||||
|
||||
void GMainWindow::OpenURL(const QUrl& url) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue