Add MacOS arm support

pspdev · May 1, 2024 · 66a8830 · 66a8830
1 parent 2e45009
commit 66a8830
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [[alpine, bash], [fedora, bash]]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install dependencies Alpine
       if: matrix.os[0] == 'alpine'
@@ -36,31 +36,35 @@ jobs:
     runs-on: ${{ matrix.os[0] }}
     strategy:
       matrix:
-        os: [[macos-latest, bash], [macos-11, bash], [ubuntu-latest, bash]]
+        os: [
+          [macos-latest, arm64, bash],
+          [macos-13, x86_64, bash],
+          [ubuntu-latest, x86_64, bash],
+          [windows-latest, x86_64, msys2]
+        ]
+      fail-fast: false
     defaults:
      run:
-      shell: ${{ matrix.os[1] }} {0}
+      shell: ${{ matrix.os[2] }} {0}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install on Ubuntu
       if: matrix.os[0] == 'ubuntu-latest'
       run: |
         sudo apt-get update
-        sudo apt-get -y install libarchive-dev libcurl4 libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev
-        echo "MSYSTEM=x64" >> $GITHUB_ENV
+        sudo apt-get -y install libcurl4 libcurl4-openssl-dev libssl-dev libarchive-dev libgpgme-dev
 
     - name: Install Dependencies Mac
       if: startsWith( matrix.os[0], 'macos' )
       run: |
-        brew install automake libarchive bash openssl libarchive gpgme libtool
-        echo "MSYSTEM=x64" >> $GITHUB_ENV
+        brew install automake bash openssl libarchive gpgme libtool
 
     - name: Compile Tools
       run: |
-        export PATH="/usr/local/opt/libtool/libexec/gnubin:$PATH"
-        export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig:/usr/local/opt/openssl@3/lib/pkgconfig"
+        export PATH="$(brew --prefix libtool)/libexec/gnubin:$PATH"
+        export PKG_CONFIG_PATH="$(brew --prefix libarchive)/lib/pkgconfig:$(brew --prefix openssl@3)/lib/pkgconfig"
         export PSPDEV=$PWD/pspdev
         export PATH=$PATH:$PSPDEV/bin
         ./build-all.sh
diff --git a/depends/check-dependencies.sh b/depends/check-dependencies.sh
@@ -6,6 +6,7 @@ header_paths=(
     "/usr/local/opt/" \
     "/opt/include" \
     "/opt/local/include" \
+    "/opt/homebrew/opt/"
     "/usr/include/$(uname -m)-linux-gnu" \
     "/usr/local/include/$(uname -m)-linux-gnu" \
     "/usr/include/i386-linux-gnu" \