Merge pull request #67 from wally4000/fix-macOS-intel

Fix macOS Intel build

.github/workflows/compilation.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os[0] }}
     strategy:
       matrix:
-        os: [[macos-latest, bash], [ubuntu-latest, bash]]
+        os: [[macos-13, bash], [ubuntu-latest, bash]]
       fail-fast: false
     defaults:
      run:
@@ -32,14 +32,14 @@ jobs:
       run: |
         brew update
         brew install gettext texinfo bison flex gnu-sed ncurses gsl gmp mpfr autoconf automake cmake libusb-compat libarchive gpgme bash openssl libtool
-        gsed -i '/Requires.private: iconv/d' /usr/local/opt/libarchive/lib/pkgconfig/libarchive.pc || true
+        gsed -i '/Requires.private: iconv/d' $(brew --prefix libarchive)/lib/pkgconfig/libarchive.pc || true
         echo "MSYSTEM=x64" >> $GITHUB_ENV
 
     - name: Runs full build in shell
       run: |
-        export PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"
-        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 gnu-sed)/libexec/gnubin:$PATH" # This really is only needed for macOS
+        export PATH="$(brew --prefix libtool)/libexec/gnubin:$PATH" # This really is only needed for macOS
+        export PKG_CONFIG_PATH="$(brew --prefix libarchive)/lib/pkgconfig:$(brew --prefix openssl)/lib/pkgconfig" #This really is only needed for macOS
         export PSPDEV=$PWD/pspdev
         export PATH=$PATH:$PSPDEV/bin
         ./build-all.sh