diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml index bef8405..3fbea32 100644 --- a/.github/workflows/prebuild.yml +++ b/.github/workflows/prebuild.yml @@ -37,27 +37,22 @@ jobs: run: brew install nasm pkg-config if: ${{ runner.os == 'macOS'}} - - name: install Mac dependencies (shared release) + - name: install ffmpeg dependencies (shared release) run: node ./install_ffmpeg.js - if: ${{ runner.os == 'macOS'}} - - - name: install Windows dependencies - run: node ./install_ffmpeg.js - if: ${{ runner.os == 'Windows'}} - - name: prebuild for macOS (x64) - run: npx prebuild --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }} - if: ${{ runner.os == 'macOS'}} +# - name: prebuild for macOS (x64) +# run: npx prebuild --runtime napi --arch x64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }} +# if: ${{ runner.os == 'macOS'}} # - name: prebuild for macOS (arm64) # run: npx prebuild --runtime napi --arch arm64 --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }} # if: ${{ runner.os == 'macOS'}} - name: prebuild for Windows - run: npx prebuild --runtime napi --include-regex '"(\.node|\.dll|ffmpeg\.exe|ffprobe\.exe)$"' --upload ${{ secrets.GITHUB_TOKEN }} + run: npx prebuild --runtime napi --include-regex '"(\.node|\.dll|ffmpeg\.exe|ffprobe\.exe)$"' shell: bash if: ${{ runner.os == 'Windows'}} - - name: prebuild for Linux - run: npx prebuild --runtime napi --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }} - if: ${{ runner.os == 'Linux'}} +# - name: prebuild for Linux +# run: npx prebuild --runtime napi --include-regex '(\.node|\.dylib|ffmpeg|ffprobe)$' --upload ${{ secrets.GITHUB_TOKEN }} +# if: ${{ runner.os == 'Linux'}} diff --git a/binding.gyp b/binding.gyp index dda4e95..b7c98c3 100644 --- a/binding.gyp +++ b/binding.gyp @@ -94,12 +94,14 @@ } ], ['OS=="win"', { + "cflags_cc": [ + "/WX" + ], "configurations": { "Release": { "msvs_settings": { "VCCLCompilerTool": { - "RuntimeTypeInfo": "true", - "AdditionalOptions": ['/WX'] + "RuntimeTypeInfo": "true" } } } @@ -128,7 +130,7 @@ "ffmpeg/ffmpeg-4.3-win64-shared/bin/avutil-56.dll", "ffmpeg/ffmpeg-4.3-win64-shared/bin/postproc-55.dll", "ffmpeg/ffmpeg-4.3-win64-shared/bin/swresample-3.dll", - "ffmpeg/ffmpeg-4.3-win64-shared/bin/swscale-5.dll", + "ffmpeg/ffmpeg-4.3-win64-shared/bin/swscale-5.dll" "node_modules/ffmpeg-ffprobe-static/ffmpeg.exe", "node_modules/ffmpeg-ffprobe-static/ffprobe.exe", ]