code review

microsoft · Oct 6, 2024 · f8690b2 · f8690b2
1 parent 5c1a256
commit f8690b2
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/build/DirectXTex-GitHub-MinGW.yml b/build/DirectXTex-GitHub-MinGW.yml
@@ -134,6 +134,10 @@ jobs:
         }
 
       workingDirectory: $(Build.SourcesDirectory)
+  - task: CmdLine@2
+    displayName: GCC version
+    inputs:
+      script: g++ --version
   - task: BatchScript@1
     displayName: CompileShaders
     inputs:
@@ -144,10 +148,6 @@ jobs:
     inputs:
       filename: DDSView/hlsl.cmd
       workingFolder: $(Build.SourcesDirectory)\DDSView
-  - task: CmdLine@2
-    displayName: GCC version
-    inputs:
-      script: g++ --version
   - task: CmdLine@2
     displayName: VCPKG install packages
     inputs:
@@ -160,7 +160,7 @@ jobs:
       cmakeArgs: >
         -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
-        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
+        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
   - task: CMake@1
     displayName: CMake (MinGW32) Build
@@ -174,7 +174,7 @@ jobs:
       cmakeArgs: >
         -B out2 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x86
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
-        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
+        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
   - task: CMake@1
     displayName: CMake (MinGW32) Build  w/ OpenEXR
@@ -188,7 +188,7 @@ jobs:
       cmakeArgs: >
         -B out3 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x86
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
-        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
+        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
   - task: CMake@1
     displayName: CMake (MinGW32) Build w/ libjpeg
@@ -202,7 +202,7 @@ jobs:
       cmakeArgs: >
         -B out4 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x86
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
-        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
+        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x86-mingw-static
   - task: CMake@1
     displayName: CMake (MinGW32) Build w/ libpng
@@ -258,6 +258,10 @@ jobs:
             Write-Error -Message "##[error]Can't find Windows SDK ($(WIN11_SDK))" -ErrorAction Stop
         }
 
+  - task: CmdLine@2
+    displayName: GCC version
+    inputs:
+      script: g++ --version
   - task: BatchScript@1
     displayName: CompileShaders.cmd
     inputs:
@@ -268,10 +272,6 @@ jobs:
     inputs:
       filename: DDSView/hlsl.cmd
       workingFolder: $(Build.SourcesDirectory)\DDSView
-  - task: CmdLine@2
-    displayName: GCC version
-    inputs:
-      script: g++ --version
   - task: CmdLine@2
     displayName: VCPKG install packages
     inputs:
@@ -284,7 +284,7 @@ jobs:
       cmakeArgs: >
         -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
-        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
+        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
   - task: CMake@1
     displayName: CMake (MinGW-W64) Build
@@ -298,7 +298,7 @@ jobs:
       cmakeArgs: >
         -B out2 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_OPENEXR_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
-        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
+        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
   - task: CMake@1
     displayName: CMake (MinGW-W64) Build  w/ OpenEXR
@@ -312,7 +312,7 @@ jobs:
       cmakeArgs: >
         -B out3 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBJPEG_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
-        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
+        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
   - task: CMake@1
     displayName: CMake (MinGW-W64) Build w/ libjpeg
@@ -326,7 +326,7 @@ jobs:
       cmakeArgs: >
         -B out4 -DCMAKE_BUILD_TYPE="Debug" -DENABLE_LIBPNG_SUPPORT=ON -DDIRECTX_ARCH=x64 -DBUILD_TESTING=OFF
         -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles"
-        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(Build.BinariesDirectory)\Shaders
+        -DUSE_PREBUILT_SHADERS=ON -DCOMPILED_SHADERS=$(CompileShadersOutput)
         -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-mingw-static
   - task: CMake@1
     displayName: CMake (MinGW-W64) Build w/ libpng