ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change all mentions of qt5 to qt@5 on macOS (#937) 

* Change all mentions of qt5 to qt@5 on macOS

* Use temporary workaround to get macOS brew updating

https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076

* Don't install CMake, it is already installed in the macOS runner
This commit is contained in:
WaluigiWare64 2021-01-13 13:56:06 +00:00 committed by GitHub
parent c109235d01
commit 8829b0511c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-macos.yml vendored
View File

@ -21,7 +21,9 @@ jobs:
- name: Install dependencies - name: Install dependencies
working-directory: ${{runner.workspace}} working-directory: ${{runner.workspace}}
run: | run: |
brew install cmake sdl2 qt5 libslirp libarchive rm -rf /usr/local/bin/2to3 # Temporary workaround suggested here - https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076
brew update
brew install sdl2 qt@5 libslirp libarchive
- name: Create build environment - name: Create build environment
run: mkdir ${{runner.workspace}}/build run: mkdir ${{runner.workspace}}/build
- name: Configure - name: Configure

2
README.md
View File

@ -86,7 +86,7 @@ If everything went well, melonDS should now be in the `dist` folder.
### macOS: ### macOS:
1. Install the [Homebrew Package Manager](https://brew.sh) 1. Install the [Homebrew Package Manager](https://brew.sh)
2. Install dependencies: `brew install git pkg-config cmake sdl2 qt5 libslirp libarchive` 2. Install dependencies: `brew install git pkg-config cmake sdl2 qt@5 libslirp libarchive`
3. Compile: 3. Compile:
```zsh ```zsh
git clone https://github.com/Arisotura/melonDS.git git clone https://github.com/Arisotura/melonDS.git