From 84277f41a117c5564715ff859710b4662c2fc88c Mon Sep 17 00:00:00 2001 From: schm1dtmac Date: Thu, 19 Mar 2026 18:38:55 +0000 Subject: [PATCH] Fix mac builds (& add some failsafes) --- .ci/build-mac.sh | 7 +++---- .ci/deploy-mac.sh | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index f386866264..8e33a09d72 100755 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -16,12 +16,12 @@ export HOMEBREW_NO_INSTALL_CLEANUP=1 brew install -f --overwrite --quiet ccache "llvm@$LLVM_COMPILER_VER" brew link -f --overwrite --quiet "llvm@$LLVM_COMPILER_VER" if [ "$AARCH64" -eq 1 ]; then - brew install -f --overwrite --quiet googletest opencv@4 sdl3 vulkan-headers vulkan-loader molten-vk - brew unlink --quiet ffmpeg fmt qtbase qtsvg qtdeclarative + brew install -f --overwrite --quiet googletest opencv@4 sdl3 vulkan-headers vulkan-loader molten-vk + brew unlink --quiet ffmpeg fmt qtbase qtsvg qtdeclarative protobuf || true else arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" arch -x86_64 /usr/local/bin/brew install -f --overwrite --quiet python@3.14 opencv@4 "llvm@$LLVM_COMPILER_VER" sdl3 vulkan-headers vulkan-loader molten-vk - arch -x86_64 /usr/local/bin/brew unlink --quiet ffmpeg qtbase qtsvg qtdeclarative + arch -x86_64 /usr/local/bin/brew unlink --quiet ffmpeg qtbase qtsvg qtdeclarative protobuf || true fi export CXX=clang++ @@ -122,7 +122,6 @@ cmake .. \ -DUSE_SYSTEM_MVK=ON \ -DUSE_SYSTEM_SDL=ON \ -DUSE_SYSTEM_OPENCV=ON \ - -DUSE_SYSTEM_PROTOBUF=ON \ -G Ninja fi diff --git a/.ci/deploy-mac.sh b/.ci/deploy-mac.sh index 70db614b59..819e0725bc 100755 --- a/.ci/deploy-mac.sh +++ b/.ci/deploy-mac.sh @@ -21,7 +21,7 @@ rm -rf "rpcs3.app/Contents/Frameworks/QtPdf.framework" \ "rpcs3.app/Contents/Frameworks/QtVirtualKeyboard.framework" \ "rpcs3.app/Contents/Plugins/platforminputcontexts" \ "rpcs3.app/Contents/Plugins/virtualkeyboard" \ -"rpcs3.app/Contents/Resources/git" +"rpcs3.app/Contents/Resources/git" || true ../../.ci/optimize-mac.sh rpcs3.app @@ -49,7 +49,7 @@ QT_TRANS="$WORKDIR/qt-downloader/$QT_VER/clang_64/translations" cp $QT_TRANS/qt_*.qm rpcs3.app/Contents/translations cp $QT_TRANS/qtbase_*.qm rpcs3.app/Contents/translations cp $QT_TRANS/qtmultimedia_*.qm rpcs3.app/Contents/translations -rm -f rpcs3.app/Contents/translations/qt_help_*.qm +rm -f rpcs3.app/Contents/translations/qt_help_*.qm || true # Need to do this rename hack due to case insensitive filesystem mv rpcs3.app RPCS3_.app