Skip to content

Commit f8690b2

Browse files
walbournwalbourn
committed
code review
1 parent 5c1a256 commit f8690b2

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎build/DirectXTex-GitHub-MinGW.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jobs:
134134
}
135135
136136
workingDirectory: $(Build.SourcesDirectory)
137+
- task: CmdLine@2
138+
displayName: GCC version
139+
inputs:
140+
script: g++ --version
137141
- task: BatchScript@1
138142
displayName: CompileShaders
139143
inputs:
@@ -144,10 +148,6 @@ jobs:
144148
inputs:
145149
filename: DDSView/hlsl.cmd
146150
workingFolder: $(Build.SourcesDirectory)\DDSView
147-
- task: CmdLine@2
148-
displayName: GCC version
149-
inputs:
150-
script: g++ --version
151151
- task: CmdLine@2
152152
displayName: VCPKG install packages
153153
inputs:
@@ -160,7 +160,7 @@ jobs:
160160
cmakeArgs: >
161161
-B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86
162162
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
163-
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
163+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
164164
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
165165
- task: CMake@1
166166
displayName: CMake (MinGW32) Build
@@ -174,7 +174,7 @@ jobs:
174174
cmakeArgs: >
175175
-B out2 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x86
176176
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
177-
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
177+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
178178
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
179179
- task: CMake@1
180180
displayName: CMake (MinGW32) Build w/ OpenEXR
@@ -188,7 +188,7 @@ jobs:
188188
cmakeArgs: >
189189
-B out3 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x86
190190
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
191-
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
191+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
192192
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
193193
- task: CMake@1
194194
displayName: CMake (MinGW32) Build w/ libjpeg
@@ -202,7 +202,7 @@ jobs:
202202
cmakeArgs: >
203203
-B out4 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x86
204204
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
205-
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
205+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
206206
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
207207
- task: CMake@1
208208
displayName: CMake (MinGW32) Build w/ libpng
@@ -258,6 +258,10 @@ jobs:
258258
Write-Error -Message "##[error]Can't find Windows SDK ($(WIN11_SDK))" -ErrorAction Stop
259259
}
260260
261+
- task: CmdLine@2
262+
displayName: GCC version
263+
inputs:
264+
script: g++ --version
261265
- task: BatchScript@1
262266
displayName: CompileShaders.cmd
263267
inputs:
@@ -268,10 +272,6 @@ jobs:
268272
inputs:
269273
filename: DDSView/hlsl.cmd
270274
workingFolder: $(Build.SourcesDirectory)\DDSView
271-
- task: CmdLine@2
272-
displayName: GCC version
273-
inputs:
274-
script: g++ --version
275275
- task: CmdLine@2
276276
displayName: VCPKG install packages
277277
inputs:
@@ -284,7 +284,7 @@ jobs:
284284
cmakeArgs: >
285285
-B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64
286286
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
287-
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
287+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
288288
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
289289
- task: CMake@1
290290
displayName: CMake (MinGW-W64) Build
@@ -298,7 +298,7 @@ jobs:
298298
cmakeArgs: >
299299
-B out2 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
300300
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
301-
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
301+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
302302
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
303303
- task: CMake@1
304304
displayName: CMake (MinGW-W64) Build w/ OpenEXR
@@ -312,7 +312,7 @@ jobs:
312312
cmakeArgs: >
313313
-B out3 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
314314
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
315-
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
315+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
316316
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
317317
- task: CMake@1
318318
displayName: CMake (MinGW-W64) Build w/ libjpeg
@@ -326,7 +326,7 @@ jobs:
326326
cmakeArgs: >
327327
-B out4 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
328328
-DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
329-
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
329+
-DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
330330
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
331331
- task: CMake@1
332332
displayName: CMake (MinGW-W64) Build w/ libpng

0 commit comments

Comments
 (0)