[Mesa-dev] [PATCH v3 48/48] use msbuild instead of ninja

Dylan Baker dylan at pnwbakers.com
Tue Aug 7 00:51:28 UTC 2018


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.
---
 appveyor.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index bbd7e1cddb0..75ab6056f57 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,8 +60,7 @@ install:
 - if "%BUILD_SYSTEM%"=="meson" py -3.7-64 -m pip install 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_amd64
 # Install flex/bison
 - cinst -y winflexbison
@@ -75,8 +74,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
 
 after_build:
 - if "%BUILD_SYSTEM%"=="scons" scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.0 llvm=1 check
-- 
2.18.0



More information about the mesa-dev mailing list