Skip to content

Commit 90a7ee2

Browse files
committed
Add MacOS arm support
1 parent 2e45009 commit 90a7ee2

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

.github/workflows/compilation.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
os: [[alpine, bash], [fedora, bash]]
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818

1919
- name: Install dependencies Alpine
2020
if: matrix.os[0] == 'alpine'
@@ -36,31 +36,35 @@ jobs:
3636
runs-on: ${{ matrix.os[0] }}
3737
strategy:
3838
matrix:
39-
os: [[macos-latest, bash], [macos-11, bash], [ubuntu-latest, bash]]
39+
os: [
40+
[macos-latest, arm64, bash],
41+
[macos-13, x86_64, bash],
42+
[ubuntu-latest, x86_64, bash],
43+
[windows-latest, x86_64, msys2]
44+
]
45+
fail-fast: false
4046
defaults:
4147
run:
42-
shell: ${{ matrix.os[1] }} {0}
48+
shell: ${{ matrix.os[2] }} {0}
4349

4450
steps:
45-
- uses: actions/checkout@v3
51+
- uses: actions/checkout@v4
4652

4753
- name: Install on Ubuntu
4854
if: matrix.os[0] == 'ubuntu-latest'
4955
run: |
5056
sudo apt-get update
5157
sudo apt-get -y install libarchive-dev libcurl4 libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev
52-
echo "MSYSTEM=x64" >> $GITHUB_ENV
5358
5459
- name: Install Dependencies Mac
5560
if: startsWith( matrix.os[0], 'macos' )
5661
run: |
5762
brew install automake libarchive bash openssl libarchive gpgme libtool
58-
echo "MSYSTEM=x64" >> $GITHUB_ENV
5963
6064
- name: Compile Tools
6165
run: |
62-
export PATH="/usr/local/opt/libtool/libexec/gnubin:$PATH"
63-
export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig:/usr/local/opt/openssl@3/lib/pkgconfig"
66+
export PATH="$(brew --prefix libtool)/libexec/gnubin:$PATH"
67+
export PKG_CONFIG_PATH="$(brew --prefix libarchive)/lib/pkgconfig:$(brew --prefix openssl@3)/lib/pkgconfig"
6468
export PSPDEV=$PWD/pspdev
6569
export PATH=$PATH:$PSPDEV/bin
6670
./build-all.sh

depends/check-dependencies.sh

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ header_paths=(
66
"/usr/local/opt/" \
77
"/opt/include" \
88
"/opt/local/include" \
9+
"/opt/homebrew/include/"
910
"/usr/include/$(uname -m)-linux-gnu" \
1011
"/usr/local/include/$(uname -m)-linux-gnu" \
1112
"/usr/include/i386-linux-gnu" \

0 commit comments

Comments
 (0)