File tree Expand file tree Collapse file tree 2 files changed +18
-21
lines changed Expand file tree Collapse file tree 2 files changed +18
-21
lines changed Original file line number Diff line number Diff line change @@ -72,19 +72,19 @@ jobs:
7272 artifact : $(artifactName)
7373
7474# Build the loader, API layers, and samples on Windows with MinGW
75- # - job: mingw_build
76- # displayName: 'Windows MinGW'
77- # variables:
78- # VULKAN_SDK: "$(System.DefaultWorkingDirectory)\\vulkan_sdk\\$(VULKAN_SDK_VERSION)"
79- # pool:
80- # vmImage: 'windows-latest'
81- # steps:
82- # - template: build_mingw.yml
83- # parameters:
84- # sourceDir: ${{parameters.sourceDir}}
85- # buildType: RelWithDebInfo
86- # cmakeArgs: -DBUILD_ALL_EXTENSIONS=ON
87- # useVulkan: 'true'
75+ - job : mingw_build
76+ displayName : ' Windows MinGW'
77+ variables :
78+ VULKAN_SDK : " $(System.DefaultWorkingDirectory)\\ vulkan_sdk\\ $(VULKAN_SDK_VERSION)"
79+ pool :
80+ vmImage : ' windows-latest'
81+ steps :
82+ - template : build_mingw.yml
83+ parameters :
84+ sourceDir : ${{parameters.sourceDir}}
85+ buildType : RelWithDebInfo
86+ cmakeArgs : -DBUILD_ALL_EXTENSIONS=ON
87+ useVulkan : ' true'
8888
8989- job : combine_artifacts
9090 dependsOn : windows_build
Original file line number Diff line number Diff line change @@ -5,11 +5,8 @@ parameters:
55 useVulkan : ' true'
66
77steps :
8- # - script: choco install -y ninja
9- # displayName: 'Install Ninja'
10-
11- - script : mkdir $(System.DefaultWorkingDirectory)\\vulkan_sdk
12- displayName : ' Make Vulkan SDK dir'
8+ - script : choco install -y ninja
9+ displayName : ' Install Ninja'
1310
1411 - powershell : ./.azure-pipelines/install_vulkan.ps1
1512 displayName : Install Vulkan SDK
@@ -22,12 +19,12 @@ steps:
2219
2320 - script : |
2421 set VULKAN_SDK=$(System.DefaultWorkingDirectory)\\vulkan_sdk\\$(VULKAN_SDK_VERSION)
25- cmake .. -G "MinGW Makefiles" ${{ parameters.cmakeArgs }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} -DCMAKE_INSTALL_PREFIX=${{ parameters.sourceDir }}/install
22+ cmake .. -G Ninja ${{ parameters.cmakeArgs }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} -DCMAKE_INSTALL_PREFIX=${{ parameters.sourceDir }}/install
2623 displayName: 'Generate build system'
2724 workingDirectory: '${{ parameters.sourceDir }}/build'
2825
29- - script : mingw32-make -C build -j
26+ - script : ninja -C build
3027 displayName : Build all targets
3128
32- - script : mingw32-make -C build install
29+ - script : ninja -C build install
3330 displayName : Install build
You can’t perform that action at this time.
0 commit comments