diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2260ed97..500143ef 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -38,6 +38,160 @@ jobs:
       ninja -C build
     displayName: 'Build'
 
+# TODO should it be "etc.bat" amd64 or "etc.bat amd64"?
+
+- job: windows_386_msvc2015_shared_ninja
+  displayName: 'Windows 386 MSVC2015 Shared Ninja'
+  pool:
+    vmImage: 'vs2015-win2012r2'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/install-latest-meson.yml
+  - script: |
+      choco install ninja
+    displayName: 'Install Dependencies'
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"
+      meson setup build --buildtype=release --default-library=shared --backend=ninja
+    displayName: 'Configure'
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"
+      ninja -C build
+    displayName: 'Build'
+
+- job: windows_386_msvc2015_static_ninja
+  displayName: 'Windows 386 MSVC2015 Static Ninja'
+  pool:
+    vmImage: 'vs2015-win2012r2'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/install-latest-meson.yml
+  - script: |
+      choco install ninja
+    displayName: 'Install Dependencies'
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"
+      meson setup build --buildtype=release --default-library=static --backend=ninja
+    displayName: 'Configure'
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"
+      ninja -C build
+    displayName: 'Build'
+
+- job: windows_386_msvc2015_shared_msbuild
+  displayName: 'Windows 386 MSVC2015 Shared with MSBuild'
+  pool:
+    vmImage: 'vs2015-win2012r2'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/install-latest-meson.yml
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"
+      meson setup build --buildtype=release --default-library=shared --backend=vs2015
+    displayName: 'Configure'
+  - task: MSBuild@1
+    inputs:
+      solution: 'build/*.sln'
+      maximumCpuCount: true
+    displayName: 'Build'
+
+- job: windows_386_msvc2015_static_msbuild
+  displayName: 'Windows 386 MSVC2015 Static with MSBuild'
+  pool:
+    vmImage: 'vs2015-win2012r2'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/install-latest-meson.yml
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat x86"
+      meson setup build --buildtype=release --default-library=static --backend=vs2015
+    displayName: 'Configure'
+  - task: MSBuild@1
+    inputs:
+      solution: 'build/*.sln'
+      maximumCpuCount: true
+    displayName: 'Build'
+
+- job: windows_amd64_msvc2015_shared_ninja
+  displayName: 'Windows amd64 MSVC2015 Shared Ninja'
+  pool:
+    vmImage: 'vs2015-win2012r2'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/install-latest-meson.yml
+  - script: |
+      choco install ninja
+    displayName: 'Install Dependencies'
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat amd64"
+      meson setup build --buildtype=release --default-library=shared --backend=ninja
+    displayName: 'Configure'
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat amd64"
+      ninja -C build
+    displayName: 'Build'
+
+- job: windows_amd64_msvc2015_static_ninja
+  displayName: 'Windows amd64 MSVC2015 Static Ninja'
+  pool:
+    vmImage: 'vs2015-win2012r2'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/install-latest-meson.yml
+  - script: |
+      choco install ninja
+    displayName: 'Install Dependencies'
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat amd64"
+      meson setup build --buildtype=release --default-library=static --backend=ninja
+    displayName: 'Configure'
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat amd64"
+      ninja -C build
+    displayName: 'Build'
+
+- job: windows_amd64_msvc2015_shared_msbuild
+  displayName: 'Windows amd64 MSVC2015 Shared with MSBuild'
+  pool:
+    vmImage: 'vs2015-win2012r2'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/install-latest-meson.yml
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat amd64"
+      meson setup build --buildtype=release --default-library=shared --backend=vs2015
+    displayName: 'Configure'
+  - task: MSBuild@1
+    inputs:
+      solution: 'build/*.sln'
+      maximumCpuCount: true
+    displayName: 'Build'
+
+- job: windows_amd64_msvc2015_static_msbuild
+  displayName: 'Windows amd64 MSVC2015 Static with MSBuild'
+  pool:
+    vmImage: 'vs2015-win2012r2'
+  workspace:
+    clean: all
+  steps:
+  - template: azure-pipelines/install-latest-meson.yml
+  - script: |
+      call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat amd64"
+      meson setup build --buildtype=release --default-library=static --backend=vs2015
+    displayName: 'Configure'
+  - task: MSBuild@1
+    inputs:
+      solution: 'build/*.sln'
+      maximumCpuCount: true
+    displayName: 'Build'
+
 - job: windows_386_msvc2017_shared_ninja
   displayName: 'Windows 386 MSVC2017 Shared Ninja'
   pool:
@@ -50,11 +204,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
       meson setup build --buildtype=release --default-library=shared --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
       ninja -C build
     displayName: 'Build'
 
@@ -70,11 +224,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
       meson setup build --buildtype=release --default-library=static --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
       ninja -C build
     displayName: 'Build'
 
@@ -87,7 +241,7 @@ jobs:
   steps:
   - template: azure-pipelines/install-latest-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
       meson setup build --buildtype=release --default-library=shared --backend=vs2017
     displayName: 'Configure'
   - task: MSBuild@1
@@ -105,7 +259,7 @@ jobs:
   steps:
   - template: azure-pipelines/install-latest-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat x86"
       meson setup build --buildtype=release --default-library=static --backend=vs2017
     displayName: 'Configure'
   - task: MSBuild@1
@@ -126,11 +280,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
       meson setup build --buildtype=release --default-library=shared --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
       ninja -C build
     displayName: 'Build'
 
@@ -146,11 +300,11 @@ jobs:
       choco install ninja
     displayName: 'Install Dependencies'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
       meson setup build --buildtype=release --default-library=static --backend=ninja
     displayName: 'Configure'
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
       ninja -C build
     displayName: 'Build'
 
@@ -163,7 +317,7 @@ jobs:
   steps:
   - template: azure-pipelines/install-latest-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
       meson setup build --buildtype=release --default-library=shared --backend=vs2017
     displayName: 'Configure'
   - task: MSBuild@1
@@ -181,7 +335,7 @@ jobs:
   steps:
   - template: azure-pipelines/install-latest-meson.yml
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat amd64"
       meson setup build --buildtype=release --default-library=static --backend=vs2017
     displayName: 'Configure'
   - task: MSBuild@1