From a393ee8fbbe6c5e4d1699907405748f15ee1decb Mon Sep 17 00:00:00 2001 From: Exverge Date: Wed, 7 Aug 2024 20:11:42 -0400 Subject: [PATCH] Fix build errors --- .github/workflows/build.yml | 3 ++- src/config/ActiveSettings.cpp | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b72bacb..e6fe4259 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -347,7 +347,8 @@ jobs: git checkout bf097edc74ec3b6dfafdcd5a38d3ce14b11952d6 ./fetchDependencies --macos make macos - make install + sudo make install + cp /usr/local/lib/libMoltenVK.dylib /opt/homebrew/lib/ - name: "Bootstrap vcpkg" run: | diff --git a/src/config/ActiveSettings.cpp b/src/config/ActiveSettings.cpp index 0d8e9b9f..f7748cf3 100644 --- a/src/config/ActiveSettings.cpp +++ b/src/config/ActiveSettings.cpp @@ -76,15 +76,13 @@ CPUMode ActiveSettings::GetCPUMode() { #ifdef __aarch64__ mode = CPUMode::SinglecoreInterpreter; - } #else - { if (GetPhysicalCoreCount() >= 4) mode = CPUMode::MulticoreRecompiler; else mode = CPUMode::SinglecoreRecompiler; - } #endif + } else if (mode == CPUMode::DualcoreRecompiler) // dualcore is disabled now mode = CPUMode::MulticoreRecompiler;