general: fix compile for Apple Clang

This commit is contained in:
Liam
2022-11-21 11:31:18 -05:00
parent aab68674c0
commit 9737615948
79 changed files with 952 additions and 37 deletions

View File

@@ -116,7 +116,7 @@ void EmuThread::run() {
}
} else {
std::unique_lock lock{running_mutex};
running_cv.wait(lock, stop_token, [this] { return IsRunning(); });
Common::CondvarWait(running_cv, lock, stop_token, [&] { return IsRunning(); });
}
}

View File

@@ -14,6 +14,7 @@
#include <QTouchEvent>
#include <QWidget>
#include "common/polyfill_thread.h"
#include "common/thread.h"
#include "core/frontend/emu_window.h"

View File

@@ -2844,6 +2844,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();
@@ -2870,6 +2871,11 @@ void GMainWindow::OnMenuReportCompatibility() {
"&gt; "
"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) {

View File

@@ -4,6 +4,7 @@
#pragma once
#include <memory>
#include <unordered_map>
#include <unordered_set>
#include <QDialog>
#include <QSortFilterProxyModel>