From 37f130ccc1e553979efae8b2cb683b989071fd0f Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 6 Mar 2025 15:37:23 -0800 Subject: [PATCH 1/5] CMake update for try-compile with DLLs --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d38f4ce..d50fc47d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,10 +5,6 @@ cmake_minimum_required (VERSION 3.20) set(DIRECTXTEX_VERSION 2.0.6) -if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET)) - set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") -endif() - project (DirectXTex VERSION ${DIRECTXTEX_VERSION} DESCRIPTION "DirectX Texture Library" From 745b9b10e07972d1b85f6504e4a95a9936e650ef Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 6 Mar 2025 15:46:24 -0800 Subject: [PATCH 2/5] More DLL test cases --- build/DirectXTex-GitHub-CMake-Dev17.yml | 25 +++++++++++++++++++++++++ build/DirectXTex-GitHub-CMake.yml | 25 +++++++++++++++++++++++++ build/DirectXTex-GitHub-GDK-Dev17.yml | 8 ++++---- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/build/DirectXTex-GitHub-CMake-Dev17.yml b/build/DirectXTex-GitHub-CMake-Dev17.yml index af88055a..1c5a9c7f 100644 --- a/build/DirectXTex-GitHub-CMake-Dev17.yml +++ b/build/DirectXTex-GitHub-CMake-Dev17.yml @@ -217,6 +217,31 @@ jobs: inputs: cwd: $(Build.SourcesDirectory) cmakeArgs: --build out12 -v --config Debug + - task: CMake@1 + displayName: 'CMake (DLL): Config x64' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out13 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON + - task: CMake@1 + displayName: 'CMake (DLL): Build x64 Debug' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: --build out13 -v --config Debug + - task: CMake@1 + displayName: 'CMake (DLL): Build x64 Release' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: --build out13 -v --config RelWithDebInfo + - task: CMake@1 + displayName: 'CMake (UWP DLL): Config x64' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out14 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON + - task: CMake@1 + displayName: 'CMake (UWP DLL): Build x64' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: --build out14 -v - job: CMAKE_BUILD_VCPKG displayName: CMake using VCPKG diff --git a/build/DirectXTex-GitHub-CMake.yml b/build/DirectXTex-GitHub-CMake.yml index 53b0f2b1..9c24f13d 100644 --- a/build/DirectXTex-GitHub-CMake.yml +++ b/build/DirectXTex-GitHub-CMake.yml @@ -177,6 +177,31 @@ jobs: inputs: cwd: $(Build.SourcesDirectory) cmakeArgs: --build out8 -v --config Debug + - task: CMake@1 + displayName: 'CMake (DLL): Config x64' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out9 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON + - task: CMake@1 + displayName: 'CMake (DLL): Build x64 Debug' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: --build out9 -v --config Debug + - task: CMake@1 + displayName: 'CMake (DLL): Build x64 Release' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: --build out9 -v --config RelWithDebInfo + - task: CMake@1 + displayName: 'CMake (UWP DLL): Config x64' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out10 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON + - task: CMake@1 + displayName: 'CMake (UWP DLL): Build x64' + inputs: + cwd: $(Build.SourcesDirectory) + cmakeArgs: --build out10 -v - job: CMAKE_BUILD_VCPKG displayName: CMake using VCPKG diff --git a/build/DirectXTex-GitHub-GDK-Dev17.yml b/build/DirectXTex-GitHub-GDK-Dev17.yml index 014f3180..8ba4d3f3 100644 --- a/build/DirectXTex-GitHub-GDK-Dev17.yml +++ b/build/DirectXTex-GitHub-GDK-Dev17.yml @@ -311,12 +311,12 @@ jobs: inputs: Contents: 'out/build' - task: CMake@1 - displayName: 'CMake (MSVC, DLL): Config Scarlett Debug' + displayName: 'CMake (DLL): Config Scarlett Debug' inputs: cwd: '$(Build.SourcesDirectory)' cmakeArgs: --preset=x64-Debug-Scarlett -DBUILD_SHARED_LIBS=ON - task: CMake@1 - displayName: 'CMake (MSVC, DLL): Build Scarlett Debug' + displayName: 'CMake (DLL): Build Scarlett Debug' inputs: cwd: '$(Build.SourcesDirectory)' cmakeArgs: --build out\build\x64-Debug-Scarlett @@ -430,12 +430,12 @@ jobs: inputs: Contents: 'out/build' - task: CMake@1 - displayName: 'CMake (MSVC, DLL): Config XboxOne Debug' + displayName: 'CMake (DLL): Config XboxOne Debug' inputs: cwd: '$(Build.SourcesDirectory)' cmakeArgs: --preset=x64-Debug-XboxOne -DBUILD_SHARED_LIBS=ON - task: CMake@1 - displayName: 'CMake (MSVC, DLL): Build XboxOne Debug' + displayName: 'CMake (DLL): Build XboxOne Debug' inputs: cwd: '$(Build.SourcesDirectory)' cmakeArgs: --build out\build\x64-Debug-XboxOne From 9a9d634005953b811e8396dbc7612cae8ff93670 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 6 Mar 2025 15:49:56 -0800 Subject: [PATCH 3/5] More DLL --- .github/workflows/uwp.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/uwp.yml b/.github/workflows/uwp.yml index e77a404f..8dcc56f6 100644 --- a/.github/workflows/uwp.yml +++ b/.github/workflows/uwp.yml @@ -70,3 +70,15 @@ jobs: - name: 'Build' working-directory: ${{ github.workspace }} run: cmake --build out\build\${{ matrix.build_type }} + + - name: 'Clean up' + working-directory: ${{ github.workspace }} + run: Remove-Item -Path out -Recurse -Force + + - name: 'Configure CMake (DLL)' + working-directory: ${{ github.workspace }} + run: cmake --preset=${{ matrix.build_type }} -DBUILD_SHARED_LIBS=ON + + - name: 'Build (DLL)' + working-directory: ${{ github.workspace }} + run: cmake --build out\build\${{ matrix.build_type }} From 5a9e328e871a2a2d468e20c6cab87323e72bfec5 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 7 Mar 2025 10:46:19 -0800 Subject: [PATCH 4/5] YAML cleanup --- build/DirectXTex-GitHub-CMake-Dev17.yml | 78 +++++++++++++------- build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml | 24 ++++-- build/DirectXTex-GitHub-CMake-Xbox.yml | 16 +++- build/DirectXTex-GitHub-CMake.yml | 40 +++++++--- 4 files changed, 112 insertions(+), 46 deletions(-) diff --git a/build/DirectXTex-GitHub-CMake-Dev17.yml b/build/DirectXTex-GitHub-CMake-Dev17.yml index 1c5a9c7f..6b78d890 100644 --- a/build/DirectXTex-GitHub-CMake-Dev17.yml +++ b/build/DirectXTex-GitHub-CMake-Dev17.yml @@ -81,7 +81,9 @@ jobs: displayName: 'CMake (MSVC): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug' inputs: @@ -96,7 +98,9 @@ jobs: displayName: 'CMake (MSVC): Config x86' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + cmakeArgs: > + -G "$(VS_GENERATOR)" -A Win32 -B out2 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x86 Debug' inputs: @@ -111,7 +115,9 @@ jobs: displayName: 'CMake (MSVC): Config ARM64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -B out3 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + cmakeArgs: > + -G "$(VS_GENERATOR)" -A ARM64 -B out3 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build ARM64 Debug' inputs: @@ -126,7 +132,9 @@ jobs: displayName: 'CMake (UWP): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out4 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out4 + -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 - task: CMake@1 displayName: 'CMake (UWP): Build x64' inputs: @@ -136,112 +144,130 @@ jobs: displayName: 'CMake (ClangCl): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out6 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out5 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out6 -v --config Debug + cmakeArgs: --build out5 -v --config Debug - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Release' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out6 -v --config RelWithDebInfo + cmakeArgs: --build out5 -v --config RelWithDebInfo - task: CMake@1 displayName: 'CMake (ClangCl): Config ARM64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out7 -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) + cmakeArgs: > + -G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out6 + -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) - task: CMake@1 displayName: 'CMake (ClangCl): Build ARM64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out7 -v --config Debug + cmakeArgs: --build out6 -v --config Debug - task: CMake@1 displayName: 'CMake (Win10): Config' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out8 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out7 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (Win10): Build' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out8 -v --config Debug + cmakeArgs: --build out7 -v --config Debug - task: CMake@1 displayName: 'CMake (MSVC Spectre): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out9 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out8 + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC Spectre): Build x64 Debug' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out9 -v --config Debug + cmakeArgs: --build out8 -v --config Debug - task: CMake@1 displayName: 'CMake (MSVC Spectre): Build x64 Release' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out9 -v --config RelWithDebInfo + cmakeArgs: --build out8 -v --config RelWithDebInfo - task: CMake@1 displayName: 'CMake (MSVC Spectre): Config ARM64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -B out10 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + cmakeArgs: > + -G "$(VS_GENERATOR)" -A ARM64 -B out9 + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC Spectre): Build ARM64 Debug' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out10 -v --config Debug + cmakeArgs: --build out9 -v --config Debug - task: CMake@1 displayName: 'CMake (MSVC Spectre): Build ARM64 Release' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out10 -v --config RelWithDebInfo + cmakeArgs: --build out9 -v --config RelWithDebInfo - task: CMake@1 displayName: 'CMake (Win10 Spectre): Config' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out11 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out10 + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (Win10 Spectre): Build' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out11 -v --config Debug + cmakeArgs: --build out10 -v --config Debug - task: CMake@1 displayName: 'CMake (NO_WCHAR_T): Config' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out12 -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out11 + -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (NO_WCHAR_T): Build' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out12 -v --config Debug + cmakeArgs: --build out11 -v --config Debug - task: CMake@1 displayName: 'CMake (DLL): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out13 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out12 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON - task: CMake@1 displayName: 'CMake (DLL): Build x64 Debug' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out13 -v --config Debug + cmakeArgs: --build out12 -v --config Debug - task: CMake@1 displayName: 'CMake (DLL): Build x64 Release' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out13 -v --config RelWithDebInfo + cmakeArgs: --build out12 -v --config RelWithDebInfo - task: CMake@1 displayName: 'CMake (UWP DLL): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out14 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out13 + -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON - task: CMake@1 displayName: 'CMake (UWP DLL): Build x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out14 -v + cmakeArgs: --build out13 -v - job: CMAKE_BUILD_VCPKG displayName: CMake using VCPKG diff --git a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml index fde88d36..c2d54831 100644 --- a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml +++ b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml @@ -97,7 +97,9 @@ jobs: displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)' inputs: @@ -112,7 +114,9 @@ jobs: displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)' inputs: @@ -127,7 +131,9 @@ jobs: displayName: 'CMake (MSVC): Config x64 (Xbox One)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out3 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)' inputs: @@ -142,7 +148,9 @@ jobs: displayName: 'CMake (ClangCl): Config x64 (Xbox One)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)' inputs: @@ -157,7 +165,9 @@ jobs: displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S, DLL)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out5 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out5 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S, DLL)' inputs: @@ -167,7 +177,9 @@ jobs: displayName: 'CMake (MSVC): Config x64 (Xbox One, DLL)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out6 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out6 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox One, DLL)' inputs: diff --git a/build/DirectXTex-GitHub-CMake-Xbox.yml b/build/DirectXTex-GitHub-CMake-Xbox.yml index 73d072df..e135ccb8 100644 --- a/build/DirectXTex-GitHub-CMake-Xbox.yml +++ b/build/DirectXTex-GitHub-CMake-Xbox.yml @@ -114,7 +114,9 @@ jobs: displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)' inputs: @@ -129,7 +131,9 @@ jobs: displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)' inputs: @@ -144,7 +148,9 @@ jobs: displayName: 'CMake (MSVC): Config x64 (Xbox One)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out3 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)' inputs: @@ -159,7 +165,9 @@ jobs: displayName: 'CMake (ClangCl): Config x64 (Xbox One)' inputs: cwd: '' - cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)' inputs: diff --git a/build/DirectXTex-GitHub-CMake.yml b/build/DirectXTex-GitHub-CMake.yml index 9c24f13d..b023907b 100644 --- a/build/DirectXTex-GitHub-CMake.yml +++ b/build/DirectXTex-GitHub-CMake.yml @@ -81,7 +81,9 @@ jobs: displayName: 'CMake (MSVC): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug' inputs: @@ -96,7 +98,9 @@ jobs: displayName: 'CMake (MSVC): Config x86' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + cmakeArgs: > + -G "$(VS_GENERATOR)" -A Win32 -B out2 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x86 Debug' inputs: @@ -111,7 +115,9 @@ jobs: displayName: 'CMake (UWP): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out3 + -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 - task: CMake@1 displayName: 'CMake (UWP): Build x64' inputs: @@ -121,7 +127,9 @@ jobs: displayName: 'CMake (ClangCl): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug' inputs: @@ -136,7 +144,9 @@ jobs: displayName: 'CMake (Win10): Config' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out5 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out5 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (Win10): Build' inputs: @@ -146,7 +156,9 @@ jobs: displayName: 'CMake (MSVC Spectre): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out6 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out6 + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC Spectre): Build x64 Debug' inputs: @@ -161,7 +173,9 @@ jobs: displayName: 'CMake (Win10 Spectre): Config' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out7 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out7 + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (Win10 Spectre): Build' inputs: @@ -171,7 +185,9 @@ jobs: displayName: 'CMake (NO_WCHAR_T): Config' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out8 -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out8 + -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (NO_WCHAR_T): Build' inputs: @@ -181,7 +197,9 @@ jobs: displayName: 'CMake (DLL): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out9 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out9 + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON - task: CMake@1 displayName: 'CMake (DLL): Build x64 Debug' inputs: @@ -196,7 +214,9 @@ jobs: displayName: 'CMake (UWP DLL): Config x64' inputs: cwd: $(Build.SourcesDirectory) - cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out10 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out10 + -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON' - task: CMake@1 displayName: 'CMake (UWP DLL): Build x64' inputs: From 367e087dae198eb50e4ef54d053d064b66253c9b Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 7 Mar 2025 11:14:40 -0800 Subject: [PATCH 5/5] More YAML changes --- build/DirectXTex-GitHub-CMake-Dev17.yml | 35 ++++++++++---- build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml | 26 ++++++---- build/DirectXTex-GitHub-CMake-Xbox.yml | 50 ++++++++++++++++++-- build/DirectXTex-GitHub-CMake.yml | 28 +++++++---- 4 files changed, 107 insertions(+), 32 deletions(-) diff --git a/build/DirectXTex-GitHub-CMake-Dev17.yml b/build/DirectXTex-GitHub-CMake-Dev17.yml index 6b78d890..94cb2256 100644 --- a/build/DirectXTex-GitHub-CMake-Dev17.yml +++ b/build/DirectXTex-GitHub-CMake-Dev17.yml @@ -83,7 +83,8 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug' inputs: @@ -100,7 +101,8 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A Win32 -B out2 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x86 Debug' inputs: @@ -117,7 +119,8 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A ARM64 -B out3 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build ARM64 Debug' inputs: @@ -175,7 +178,8 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out7 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (Win10): Build' inputs: @@ -187,7 +191,9 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out8 - -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC Spectre): Build x64 Debug' inputs: @@ -204,7 +210,9 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A ARM64 -B out9 - -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC Spectre): Build ARM64 Debug' inputs: @@ -221,7 +229,9 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out10 - -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (Win10 Spectre): Build' inputs: @@ -233,7 +243,9 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out11 - -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON + -DNO_WCHAR_T=ON + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) + -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (NO_WCHAR_T): Build' inputs: @@ -245,7 +257,9 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out12 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=ON + -DBUILD_SHARED_LIBS=ON - task: CMake@1 displayName: 'CMake (DLL): Build x64 Debug' inputs: @@ -262,7 +276,8 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out13 - -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON + -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 + -DBUILD_SHARED_LIBS=ON - task: CMake@1 displayName: 'CMake (UWP DLL): Build x64' inputs: diff --git a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml index c2d54831..173af6aa 100644 --- a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml +++ b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml @@ -99,7 +99,8 @@ jobs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)' inputs: @@ -116,7 +117,8 @@ jobs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)' inputs: @@ -133,7 +135,8 @@ jobs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out3 - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)' inputs: @@ -150,7 +153,8 @@ jobs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)' inputs: @@ -162,26 +166,28 @@ jobs: cwd: '' cmakeArgs: --build out4 -v --config RelWithDebInfo - task: CMake@1 - displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S, DLL)' + displayName: 'CMake (DLL): Config x64 (Xbox Series X|S)' inputs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out5 - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON - task: CMake@1 - displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S, DLL)' + displayName: 'CMake (DLL): Build x64 Debug (Xbox Series X|S)' inputs: cwd: '' cmakeArgs: --build out5 -v --config Debug - task: CMake@1 - displayName: 'CMake (MSVC): Config x64 (Xbox One, DLL)' + displayName: 'CMake (DLL): Config x64 (Xbox One)' inputs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out6 - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON - task: CMake@1 - displayName: 'CMake (MSVC): Build x64 Debug (Xbox One, DLL)' + displayName: 'CMake (DLL): Build x64 Debug (Xbox One)' inputs: cwd: '' cmakeArgs: --build out6 -v --config Debug diff --git a/build/DirectXTex-GitHub-CMake-Xbox.yml b/build/DirectXTex-GitHub-CMake-Xbox.yml index e135ccb8..b63e5ecb 100644 --- a/build/DirectXTex-GitHub-CMake-Xbox.yml +++ b/build/DirectXTex-GitHub-CMake-Xbox.yml @@ -116,7 +116,8 @@ jobs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)' inputs: @@ -133,7 +134,8 @@ jobs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)' inputs: @@ -150,7 +152,8 @@ jobs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out3 - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)' inputs: @@ -167,7 +170,8 @@ jobs: cwd: '' cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF - task: CMake@1 displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)' inputs: @@ -178,3 +182,41 @@ jobs: inputs: cwd: '' cmakeArgs: --build out4 -v --config RelWithDebInfo + - task: CMake@1 + displayName: 'CMake (DLL): Config x64 (Xbox Series X|S)' + inputs: + cwd: '' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out5 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF + -DBUILD_SHARED_LIBS=ON + - task: CMake@1 + displayName: 'CMake (DLL): Build x64 Debug (Xbox Series X|S)' + inputs: + cwd: '' + cmakeArgs: --build out5 -v --config Debug + - task: CMake@1 + displayName: 'CMake (DLL): Build x64 Release (Xbox Series X|S)' + inputs: + cwd: '' + cmakeArgs: --build out5 -v --config RelWithDebInfo + - task: CMake@1 + displayName: 'CMake (DLL): Config x64 (Xbox One)' + inputs: + cwd: '' + cmakeArgs: > + -G "$(VS_GENERATOR)" -A x64 -B out6 + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF + -DBUILD_SHARED_LIBS=ON + - task: CMake@1 + displayName: 'CMake (DLL): Build x64 Debug (Xbox One)' + inputs: + cwd: '' + cmakeArgs: --build out6 -v --config Debug + - task: CMake@1 + displayName: 'CMake (DLL): Build x64 Release (Xbox One)' + inputs: + cwd: '' + cmakeArgs: --build out6 -v --config RelWithDebInfo diff --git a/build/DirectXTex-GitHub-CMake.yml b/build/DirectXTex-GitHub-CMake.yml index b023907b..bf662629 100644 --- a/build/DirectXTex-GitHub-CMake.yml +++ b/build/DirectXTex-GitHub-CMake.yml @@ -83,7 +83,8 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x64 Debug' inputs: @@ -100,7 +101,8 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A Win32 -B out2 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC): Build x86 Debug' inputs: @@ -146,7 +148,8 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out5 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (Win10): Build' inputs: @@ -158,7 +161,9 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out6 - -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=OFF - task: CMake@1 displayName: 'CMake (MSVC Spectre): Build x64 Debug' inputs: @@ -175,7 +180,9 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out7 - -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON + -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (Win10 Spectre): Build' inputs: @@ -187,7 +194,9 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out8 - -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON + -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON + -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) + -DBUILD_DX12=ON - task: CMake@1 displayName: 'CMake (NO_WCHAR_T): Build' inputs: @@ -199,7 +208,9 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out9 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON -DBUILD_SHARED_LIBS=ON + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) + -DBUILD_DX12=ON + -DBUILD_SHARED_LIBS=ON - task: CMake@1 displayName: 'CMake (DLL): Build x64 Debug' inputs: @@ -216,7 +227,8 @@ jobs: cwd: $(Build.SourcesDirectory) cmakeArgs: > -G "$(VS_GENERATOR)" -A x64 -B out10 - -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_SHARED_LIBS=ON' + -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 + -DBUILD_SHARED_LIBS=ON - task: CMake@1 displayName: 'CMake (UWP DLL): Build x64' inputs: