CI: Update Windows build for current Meson options
authorDaniel Stone <daniels@collabora.com>
Thu, 26 Nov 2020 19:01:40 +0000 (19:01 +0000)
committerErik Faye-Lund <erik.faye-lund@collabora.com>
Fri, 27 Nov 2020 11:22:07 +0000 (11:22 +0000)
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7537>

.gitlab-ci/windows/mesa_build.ps1

index 6d45402..339b8d8 100644 (file)
@@ -6,7 +6,7 @@ Get-Date
 Write-Host "Compiling Mesa"
 $builddir = New-Item -ItemType Directory -Name "_build"
 Push-Location $builddir.FullName
-cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson --default-library=shared --buildtype=release -Db_ndebug=false -Db_vscrt=mt --cmake-prefix-path="C:\llvm-10" --pkg-config-path="C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig" -Dllvm=true -Dshared-llvm=false -Dgallium-drivers=swrast -Dbuild-tests=true && ninja -j32 test'
+cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson --default-library=shared --buildtype=release -Db_ndebug=false -Db_vscrt=mt --cmake-prefix-path="C:\llvm-10" --pkg-config-path="C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig" -Dllvm=enabled -Dshared-llvm=disabled -Dgallium-drivers=swrast -Dbuild-tests=true && ninja -j32 test'
 $buildstatus = $?
 Pop-Location