Add MinGW to azure-pipelines

KhronosGroup · May 13, 2020 · c2db7df · c2db7df
1 parent a8cbb01
commit c2db7df
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/.azure-pipelines/build_jobs.yml b/.azure-pipelines/build_jobs.yml
@@ -72,19 +72,19 @@ jobs:
         artifact: $(artifactName)
 
 # Build the loader, API layers, and samples on Windows with MinGW
-# - job: mingw_build
-#   displayName: 'Windows MinGW'
-#   variables:
-#     VULKAN_SDK: "$(System.DefaultWorkingDirectory)\\vulkan_sdk\\$(VULKAN_SDK_VERSION)"
-#   pool:
-#     vmImage: 'windows-latest'
-#   steps:
-#     - template: build_mingw.yml
-#       parameters:
-#         sourceDir: ${{parameters.sourceDir}}
-#         buildType: RelWithDebInfo
-#         cmakeArgs: -DBUILD_ALL_EXTENSIONS=ON
-#         useVulkan: 'true'
+- job: mingw_build
+  displayName: 'Windows MinGW'
+  variables:
+    VULKAN_SDK: "$(System.DefaultWorkingDirectory)\\vulkan_sdk\\$(VULKAN_SDK_VERSION)"
+  pool:
+    vmImage: 'windows-latest'
+  steps:
+    - template: build_mingw.yml
+      parameters:
+        sourceDir: ${{parameters.sourceDir}}
+        buildType: RelWithDebInfo
+        cmakeArgs: -DBUILD_ALL_EXTENSIONS=ON
+        useVulkan: 'true'
 
 - job: combine_artifacts
   dependsOn: windows_build

diff --git a/.azure-pipelines/build_mingw.yml b/.azure-pipelines/build_mingw.yml
@@ -5,11 +5,8 @@ parameters:
   useVulkan: 'true'
 
 steps:
-  # - script: choco install -y ninja
-  #   displayName: 'Install Ninja'
-
-  - script: mkdir  $(System.DefaultWorkingDirectory)\\vulkan_sdk
-    displayName: 'Make Vulkan SDK dir'
+  - script: choco install -y ninja
+    displayName: 'Install Ninja'
 
   - powershell:  ./.azure-pipelines/install_vulkan.ps1
     displayName: Install Vulkan SDK
@@ -22,12 +19,12 @@ steps:
 
   - script: |
       set VULKAN_SDK=$(System.DefaultWorkingDirectory)\\vulkan_sdk\\$(VULKAN_SDK_VERSION)
-      cmake .. -G "MinGW Makefiles" ${{ parameters.cmakeArgs }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} -DCMAKE_INSTALL_PREFIX=${{ parameters.sourceDir }}/install
+      cmake .. -G Ninja ${{ parameters.cmakeArgs }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} -DCMAKE_INSTALL_PREFIX=${{ parameters.sourceDir }}/install
     displayName: 'Generate build system'
     workingDirectory: '${{ parameters.sourceDir }}/build'
 
-  - script: mingw32-make -C build -j
+  - script: ninja -C build
     displayName: Build all targets
 
-  - script: mingw32-make -C build install
+  - script: ninja -C build install
     displayName: Install build