diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53877eef35..4b3c879e2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,6 +170,7 @@ jobs: run: | $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' -and ` $_ -ne 'C:\Strawberry\c\bin' }) -join ';' + $env:PATH += ';C:\Program Files\NASM' Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll" Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64" ./ci/build-win32.ps1 diff --git a/ci/build-win32.ps1 b/ci/build-win32.ps1 index ca2b0fd25a..489e12c794 100644 --- a/ci/build-win32.ps1 +++ b/ci/build-win32.ps1 @@ -136,6 +136,14 @@ $projects = @( URL = "https://code.videolan.org/videolan/libplacebo.git" Revision = "master" }, + @{ + Path = "$subprojects/dav1d.wrap" + URL = "https://code.videolan.org/videolan/dav1d" + Revision = "master" + Provides = @( + "dav1d = dav1d_dep" + ) + }, @{ Path = "$subprojects/spirv-cross.wrap" URL = "https://github.com/KhronosGroup/SPIRV-Cross" @@ -179,6 +187,7 @@ meson setup build ` -Dffmpeg:programs=disabled ` -Dffmpeg:sdl2=disabled ` -Dffmpeg:vulkan=auto ` + -Dffmpeg:libdav1d=enabled ` -Dlcms2:fastfloat=true ` -Dlcms2:jpeg=disabled ` -Dlcms2:tiff=disabled `