Install molten-vk using brew (vs getching it directly with url) to fix macOS build
This commit is contained in:
parent
7f990ea90d
commit
4e81d91f88
|
@ -30,10 +30,7 @@ jobs:
|
||||||
|
|
||||||
- name: Install MoltenVK
|
- name: Install MoltenVK
|
||||||
run: |
|
run: |
|
||||||
curl -LO https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.10/MoltenVK-macos.tar
|
brew install molten-vk
|
||||||
tar xf MoltenVK-macos.tar
|
|
||||||
sudo mkdir -p /usr/local/lib
|
|
||||||
sudo cp MoltenVK/MoltenVK/dylib/macOS/libMoltenVK.dylib /usr/local/lib/libMoltenVK.dylib
|
|
||||||
|
|
||||||
- name: Setup Qt
|
- name: Setup Qt
|
||||||
uses: jurplel/install-qt-action@v4
|
uses: jurplel/install-qt-action@v4
|
||||||
|
|
|
@ -30,10 +30,7 @@ jobs:
|
||||||
|
|
||||||
- name: Install MoltenVK
|
- name: Install MoltenVK
|
||||||
run: |
|
run: |
|
||||||
curl -LO https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.10/MoltenVK-macos.tar
|
brew install molten-vk
|
||||||
tar xf MoltenVK-macos.tar
|
|
||||||
sudo mkdir -p /usr/local/lib
|
|
||||||
sudo cp MoltenVK/MoltenVK/dylib/macOS/libMoltenVK.dylib /usr/local/lib/libMoltenVK.dylib
|
|
||||||
|
|
||||||
- name: Configure CMake
|
- name: Configure CMake
|
||||||
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_ARCHITECTURES=x86_64
|
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_ARCHITECTURES=x86_64
|
||||||
|
@ -45,7 +42,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
mkdir upload
|
mkdir upload
|
||||||
mv ${{github.workspace}}/build/shadps4 upload
|
mv ${{github.workspace}}/build/shadps4 upload
|
||||||
cp /usr/local/lib/libMoltenVK.dylib upload
|
cp /opt/homebrew/opt/molten-vk/lib/libMoltenVK.dylib upload
|
||||||
install_name_tool -add_rpath "@loader_path" upload/shadps4
|
install_name_tool -add_rpath "@loader_path" upload/shadps4
|
||||||
tar cf shadps4-macos.tar.gz -C upload .
|
tar cf shadps4-macos.tar.gz -C upload .
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue