From de3864dba71e8f8793b31c69ada9746d163794e1 Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:17:50 -0700 Subject: [PATCH] Install x86_64 MoltenVK from Homebrew. (#318) --- .github/workflows/macos-qt.yml | 3 ++- .github/workflows/macos.yml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-qt.yml b/.github/workflows/macos-qt.yml index e548b1ae..e9a9aa4f 100644 --- a/.github/workflows/macos-qt.yml +++ b/.github/workflows/macos-qt.yml @@ -30,7 +30,8 @@ jobs: - name: Install MoltenVK run: | - brew install molten-vk + 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 molten-vk - name: Setup Qt uses: jurplel/install-qt-action@v4 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 1644164f..910f0484 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -30,7 +30,8 @@ jobs: - name: Install MoltenVK run: | - brew install molten-vk + 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 molten-vk - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_ARCHITECTURES=x86_64 @@ -42,7 +43,7 @@ jobs: run: | mkdir upload mv ${{github.workspace}}/build/shadps4 upload - cp /opt/homebrew/opt/molten-vk/lib/libMoltenVK.dylib upload + cp $(arch -x86_64 /usr/local/bin/brew --prefix)/opt/molten-vk/lib/libMoltenVK.dylib upload install_name_tool -add_rpath "@loader_path" upload/shadps4 tar cf shadps4-macos.tar.gz -C upload .