Merge pull request #1313 from bnnm/master

builds fixes

.github/workflows/cmake-mac.yml

@@ -19,7 +19,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install dependencies
-        run: brew install autoconf automake cmake ffmpeg jansson libao libvorbis mpg123
+        run: brew install autoconf automake cmake pkgconfig ffmpeg jansson libao libvorbis mpg123
 
       - name: Cache celt
         uses: actions/cache@v3
@@ -62,8 +62,6 @@ jobs:
         shell: bash
         env:
           UPLOADER_GITHUB_TOKEN: ${{ secrets.UPLOADER_GITHUB_TOKEN }}
-        # tar cvfz vgmstream-linux-123.tar.gz -C ./build/cli vgmstream123
-        # tar cvfz vgmstream-linux-audacious.tar.gz -C ./build/audacious vgmstream.so
         run: |
           tar cvfz vgmstream-mac-cli.tar.gz -C ./build/cli vgmstream-cli
           python3 .github/uploader.py vgmstream-mac-cli.tar.gz

.github/workflows/vs-win.yml

@@ -66,11 +66,12 @@ jobs:
       - name: Upload artifacts to vgmstream-releases
         if: github.event_name != 'pull_request' 
         shell: cmd
+        working-directory: ${{github.workspace}}
         env:
           UPLOADER_GITHUB_TOKEN: ${{ secrets.UPLOADER_GITHUB_TOKEN }}
         run: |
-          python ${{github.workspace}}\.github\uploader.py ${{runner.workspace}}\bin\vgmstream-win.zip ${{runner.workspace}}\bin\vgmstream-win64.zip ${{runner.workspace}}\bin\foo_input_vgmstream.fb2k-component
-          python ${{github.workspace}}\.github\uploader.py --changelog
+          python .github\uploader.py bin\vgmstream-win.zip bin\vgmstream-win64.zip bin\foo_input_vgmstream.fb2k-component
+          python .github\uploader.py --changelog
 
       #- name: Upload artifacts to S3
       #  if: github.event_name != 'pull_request' 

msvc-build.ps1

@@ -279,7 +279,7 @@ function MakePackage
 # github actions/artifact uploads config, that need a dir with files to make an .zip artifact (don't allow single/pre-zipped files)
 function MakePackageArtifacts
 {
-    #MakePackage
+    MakePackage
 
     mkdir -Force bin/artifacts/cli-x32
     mkdir -Force bin/artifacts/cli-x64