I think that most windows users probably find using msbuild more
interesting than ninja, even if ninja is faster. I've left the ninja
build in case someone wants to look at it.

- v4: Add /m switch to make build somewhat faster
---
 appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b26a3c624e8..6277e9636d9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -66,8 +66,7 @@ install:
 - if "%BUILD_SYSTEM%"=="meson" py -3.7-64 -m pip install mako meson
 - if "%BUILD_SYSTEM%"=="meson" set Path=C:\Python37-x64\Scripts;%Path%
 - if "%BUILD_SYSTEM%"=="meson" meson --version
-- if "%BUILD_SYSTEM%"=="meson" cinst -y ninja pkgconfiglite
-- if "%BUILD_SYSTEM%"=="meson" ninja --version
+- if "%BUILD_SYSTEM%"=="meson" cinst -y pkgconfiglite
 - if "%BUILD_SYSTEM%"=="meson" call "C:\Program Files (x86)\Microsoft Visual 
Studio 14.0\VC\vcvarsall.bat" x86
 # Install flex/bison
 - cinst -y winflexbison
@@ -81,8 +80,9 @@ install:
 
 build_script:
 - if "%BUILD_SYSTEM%"=="scons" scons -j%NUMBER_OF_PROCESSORS% 
MSVC_VERSION=14.0 llvm=1
-- if "%BUILD_SYSTEM%"=="meson" meson builddir -Dbuild-tests=true
-- if "%BUILD_SYSTEM%"=="meson" ninja -C builddir
+- if "%BUILD_SYSTEM%"=="meson" meson builddir --backend=vs2015 
-Dbuild-tests=true
+- if "%BUILD_SYSTEM%"=="meson" cd builddir
+- if "%BUILD_SYSTEM%"=="meson" msbuild mesa.sln /m
 
 after_build:
 - if "%BUILD_SYSTEM%"=="scons" scons -j%NUMBER_OF_PROCESSORS% 
MSVC_VERSION=14.0 llvm=1 check
-- 
2.18.0

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to