diff --git a/.azuredevops/pipelines/DirectXTK-GitHub-CMake-Dev17.yml b/.azuredevops/pipelines/DirectXTK-GitHub-CMake-Dev17.yml deleted file mode 100644 index 1e62bd271..000000000 --- a/.azuredevops/pipelines/DirectXTK-GitHub-CMake-Dev17.yml +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# http://go.microsoft.com/fwlink/?LinkId=248929 - -# Builds the library using CMake with VS Generator (GitHub Actions covers Ninja). - -schedules: - - cron: "0 4 * * *" - displayName: 'Nightly build' - branches: - include: - - main - -trigger: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - '.github/**' - - '.nuget/*' - - build/*.cmd - - build/*.json - - build/*.props - - build/*.ps1 - - build/*.targets - -pr: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - '.github/**' - - '.nuget/*' - - build/*.cmd - - build/*.json - - build/*.props - - build/*.ps1 - - build/*.targets - drafts: false - -resources: - repositories: - - repository: self - type: git - ref: refs/heads/main - -name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) - -variables: - Codeql.Enabled: false - VS_GENERATOR: 'Visual Studio 17 2022' - WIN10_SDK: '10.0.19041.0' - WIN11_SDK: '10.0.26100.0' - -pool: - vmImage: windows-2022 - -jobs: - - job: CMAKE_BUILD - displayName: CMake using VS Generator - steps: - - checkout: self - clean: true - fetchTags: false - - task: CMake@1 - 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_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - - task: CMake@1 - displayName: 'CMake (MSVC): Build x64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC): Build x64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out -v --config RelWithDebInfo - - task: CMake@1 - 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_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - - task: CMake@1 - displayName: 'CMake (MSVC): Build x86 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out2 -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC): Build x86 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out2 -v --config RelWithDebInfo - - task: CMake@1 - 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_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - - task: CMake@1 - displayName: 'CMake (MSVC): Build ARM64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out3 -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC): Build ARM64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out3 -v --config RelWithDebInfo - - task: CMake@1 - 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 - - task: CMake@1 - displayName: 'CMake (UWP): Build x64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out4 -v - - task: CMake@1 - displayName: 'CMake (ClangCl): Config x64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out5 - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - - task: CMake@1 - displayName: 'CMake (ClangCl): Build x64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out5 -v --config Debug - - task: CMake@1 - displayName: 'CMake (ClangCl): Build x64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - 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 out6 - -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) - -DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - - task: CMake@1 - displayName: 'CMake (ClangCl): Build ARM64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out6 -v --config Debug - - task: CMake@1 - displayName: 'CMake (Win10): Config' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -A x64 -B out7 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_XAUDIO_WIN10=ON -DBUILD_TOOLS=OFF - - task: CMake@1 - displayName: 'CMake (Win10): Build' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out7 -v - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Config x64' - inputs: - 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_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Build x64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out8 -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Build x64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - 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 out9 - -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Build ARM64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out9 -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Build ARM64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out9 -v --config RelWithDebInfo - - task: CMake@1 - displayName: 'CMake (NO_WCHAR_T): Config' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -A x64 -B out10 - -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON - -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) - - task: CMake@1 - displayName: 'CMake (NO_WCHAR_T): Build' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out10 -v --config Debug - - task: CMake@1 - displayName: 'CMake (DLL): Config x64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -A x64 -B out11 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - -DBUILD_SHARED_LIBS=ON - - task: CMake@1 - displayName: 'CMake (DLL): Build x64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out11 -v --config Debug - - task: CMake@1 - displayName: 'CMake (DLL): Build x64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out11 -v --config RelWithDebInfo diff --git a/.azuredevops/pipelines/DirectXTK-GitHub-CMake.yml b/.azuredevops/pipelines/DirectXTK-GitHub-CMake.yml deleted file mode 100644 index 4cc379d88..000000000 --- a/.azuredevops/pipelines/DirectXTK-GitHub-CMake.yml +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# http://go.microsoft.com/fwlink/?LinkId=248929 - -# Builds the library using CMake with VS Generator (GitHub Actions covers Ninja). - -schedules: - - cron: "0 4 * * *" - displayName: 'Nightly build' - branches: - include: - - main - -trigger: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - '.github/**' - - '.nuget/*' - - build/*.cmd - - build/*.json - - build/*.props - - build/*.ps1 - - build/*.targets - -pr: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - '.github/**' - - '.nuget/*' - - build/*.cmd - - build/*.json - - build/*.props - - build/*.ps1 - - build/*.targets - drafts: false - -resources: - repositories: - - repository: self - type: git - ref: refs/heads/main - -name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) - -variables: - Codeql.Enabled: false - VS_GENERATOR: 'Visual Studio 17 2022' - WIN10_SDK: '10.0.19041.0' - WIN11_SDK: '10.0.26100.0' - -pool: - vmImage: windows-2022 - -jobs: - - job: CMAKE_BUILD - displayName: CMake using VS Generator - steps: - - checkout: self - clean: true - fetchTags: false - - task: CMake@1 - displayName: 'CMake (MSVC): Config x64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -T v142 -A x64 -B out - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - - task: CMake@1 - displayName: 'CMake (MSVC): Build x64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC): Build x64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out -v --config RelWithDebInfo - - task: CMake@1 - displayName: 'CMake (MSVC): Config x86' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -T v142 -A Win32 -B out2 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - - task: CMake@1 - displayName: 'CMake (MSVC): Build x86 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out2 -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC): Build x86 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out2 -v --config RelWithDebInfo - - task: CMake@1 - displayName: 'CMake (UWP): Config x64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -T v142 -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: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out3 -v - - task: CMake@1 - displayName: 'CMake (Win10): Config' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -T v142 -A x64 -B out4 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_XAUDIO_WIN10=ON -DBUILD_TOOLS=OFF - - task: CMake@1 - displayName: 'CMake (Win10): Build' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out4 -v - - task: CMake@1 - displayName: 'CMake (NO_WCHAR_T): Config' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -T v142 -A x64 -B out5 - -DNO_WCHAR_T=ON - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)' - - task: CMake@1 - displayName: 'CMake (NO_WCHAR_T): Build' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out5 -v --config Debug - - task: CMake@1 - displayName: 'CMake (DLL): Config x64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -T v142 -A x64 -B out6 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON - -DBUILD_SHARED_LIBS=ON - - task: CMake@1 - displayName: 'CMake (DLL): Build x64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out6 -v --config Debug - - task: CMake@1 - displayName: 'CMake (DLL): Build x64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out6 -v --config RelWithDebInfo diff --git a/.azuredevops/pipelines/DirectXTK-GitHub-MinGW.yml b/.azuredevops/pipelines/DirectXTK-GitHub-MinGW.yml deleted file mode 100644 index 754813cfe..000000000 --- a/.azuredevops/pipelines/DirectXTK-GitHub-MinGW.yml +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# https://go.microsoft.com/fwlink/?LinkId=248929 - -# Builds the library and test suite using the MinGW compiler. - -schedules: - - cron: "0 3 * * *" - displayName: 'Nightly build' - branches: - include: - - main - -trigger: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - '.github/**' - - '.nuget/*' - - build/*.cmd - - build/OneFuzz*.json - - build/*.props - - build/*.ps1 - - build/*.targets - -pr: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - '.github/**' - - '.nuget/*' - - build/*.cmd - - build/OneFuzz*.json - - build/*.props - - build/*.ps1 - - build/*.targets - drafts: false - -resources: - repositories: - - repository: self - type: git - ref: refs/heads/main - - repository: vcpkgRepo - name: Microsoft/vcpkg - type: github - endpoint: microsoft - ref: refs/tags/$(VCPKG_TAG) - - repository: testRepo - name: walbourn/directxtktest - type: github - endpoint: microsoft - ref: refs/heads/main - -name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) - -pool: - vmImage: windows-2022 - -variables: - - group: dxtk-shared-variables - - name: Codeql.Enabled - value: false - - name: VCPKG_ROOT - value: '$(Build.SourcesDirectory)/vcpkg' - - name: VCPKG_CMAKE_DIR - value: '$(Build.SourcesDirectory)/vcpkg/scripts/buildsystems/vcpkg.cmake' - - name: VCPKG_MANIFEST_DIR - value: '$(Build.SourcesDirectory)/build' - - name: WIN11_SDK - value: '10.0.26100.0' - - name: BASE_URL - value: https://github.com/brechtsanders/winlibs_mingw/releases/download - - name: URL_MINGW32 - value: $(BASE_URL)/12.2.0-14.0.6-10.0.0-ucrt-r2/winlibs-i686-posix-dwarf-gcc-12.2.0-llvm-14.0.6-mingw-w64ucrt-10.0.0-r2.zip - - name: HASH_MINGW32 - value: 'fcd1e11b896190da01c83d5b5fb0d37b7c61585e53446c2dab0009debc3915e757213882c35e35396329338de6f0222ba012e23a5af86932db45186a225d1272' - - name: CompileShadersOutput - value: '$(Build.BinariesDirectory)\Shaders' - -jobs: - - job: MINGW32_BUILD - displayName: 'Minimalist GNU for Windows (MinGW32)' - timeoutInMinutes: 30 - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: vcpkgRepo - displayName: Fetch VCPKG - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/vcpkg' - - task: CmdLine@2 - displayName: VCPKG Bootstrap - inputs: - script: | - call bootstrap-vcpkg.bat - echo ##vso[task.setvariable variable=VCPKG_DEFAULT_TRIPLET;]x86-mingw-static - echo ##vso[task.setvariable variable=VCPKG_DEFAULT_HOST_TRIPLET;]x86-mingw-static - - workingDirectory: $(Build.SourcesDirectory)\vcpkg - - task: PowerShell@2 - displayName: Install MinGW32 and setup for Windows 11 SDK - inputs: - targetType: inline - script: | - $ProgressPreference = 'SilentlyContinue' - Write-Host "Downloading winlibs..." - Invoke-WebRequest -Uri "$(URL_MINGW32)" -OutFile "gw32.zip" - Write-Host "Downloaded." - $fileHash = Get-FileHash -Algorithm SHA512 gw32.zip | ForEach { $_.Hash} | Out-String - $filehash = $fileHash.Trim() - Write-Host "##[debug]SHA512: " $fileHash - if ($fileHash -ne '$(HASH_MINGW32)') { - Write-Error -Message "##[error]Computed hash does not match!" -ErrorAction Stop - } - Write-Host "Extracting winlibs..." - Expand-Archive -LiteralPath 'gw32.zip' - Write-Host "Extracted." - Write-Host "Added to path: $env:BUILD_SOURCESDIRECTORY\gw32\mingw32\bin" - Write-Host "##vso[task.prependpath]$env:BUILD_SOURCESDIRECTORY\gw32\mingw32\bin" - $sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10 - $wsdkbin = "{0}bin\" -f $sdkroot - $wsdkverbin = "{0}bin\$(WIN11_SDK)\" -f $sdkroot - $wsdkarchbin = "{0}bin\$(WIN11_SDK)\x86" -f $sdkroot - if (Test-Path "$wsdkarchbin") { - Write-Host "##vso[task.setvariable variable=WindowsSdkBinPath;]$wsdkbin" - Write-Host "##vso[task.setvariable variable=WindowsSdkVerBinPath;]$wsdkverbin" - Write-Host "##vso[task.prependpath]$wsdkarchbin" - } - else { - Write-Error -Message "##[error]Can't find Windows SDK ($(WIN11_SDK))" -ErrorAction Stop - } - - workingDirectory: $(Build.SourcesDirectory) - - task: CmdLine@2 - displayName: GCC version - inputs: - script: g++ --version - - task: BatchScript@1 - displayName: CompileShaders - inputs: - filename: Src/Shaders/CompileShaders.cmd - workingFolder: $(Build.SourcesDirectory)\Src\Shaders - # Test suite for DirectX Tool Kit for DX11 needs DX12 headers for the simplemath test. - - task: CmdLine@2 - displayName: VCPKG install packages - inputs: - script: call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x86-mingw-static - workingDirectory: $(VCPKG_ROOT) - - task: CMake@1 - displayName: CMake (MinGW32) - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: > - -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x86 -DBUILD_XAUDIO_REDIST=ON - -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" - -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 - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out - - - job: MINGW64_BUILD - displayName: 'Minimalist GNU for Windows (MinGW-W64) BUILD_TESTING=ON' - timeoutInMinutes: 90 - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: vcpkgRepo - displayName: Fetch VCPKG - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/vcpkg' - - checkout: testRepo - displayName: Fetch Tests - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/Tests' - - task: CmdLine@2 - displayName: VCPKG Bootstrap - inputs: - script: | - call bootstrap-vcpkg.bat - echo ##vso[task.setvariable variable=VCPKG_DEFAULT_TRIPLET;]x64-mingw-static - echo ##vso[task.setvariable variable=VCPKG_DEFAULT_HOST_TRIPLET;]x64-mingw-static - - workingDirectory: $(Build.SourcesDirectory)\vcpkg - - task: PowerShell@2 - displayName: Setup for Shader Compilation - inputs: - targetType: inline - script: | - $ProgressPreference = 'SilentlyContinue' - $sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10 - $wsdkbin = "{0}bin\" -f $sdkroot - $wsdkverbin = "{0}bin\$(WIN11_SDK)\" -f $sdkroot - $wsdkarchbin = "{0}bin\$(WIN11_SDK)\x64" -f $sdkroot - if (Test-Path "$wsdkarchbin") { - Write-Host "##vso[task.setvariable variable=WindowsSdkBinPath;]$wsdkbin" - Write-Host "##vso[task.setvariable variable=WindowsSdkVerBinPath;]$wsdkverbin" - Write-Host "##vso[task.prependpath]$wsdkarchbin" - } - else { - 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 - inputs: - filename: Src/Shaders/CompileShaders.cmd - workingFolder: $(Build.SourcesDirectory)\Src\Shaders - - task: CmdLine@2 - displayName: VCPKG install packages - inputs: - script: call vcpkg install --x-manifest-root=$(VCPKG_MANIFEST_DIR) --triplet=x64-mingw-static - workingDirectory: $(VCPKG_ROOT) - - task: CMake@1 - displayName: CMake (MinGW-W64) - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: > - -B out -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64 -DBUILD_XAUDIO_REDIST=ON - -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" - -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 - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out - - task: CMake@1 - displayName: CMake (MinGW-W64) as Shared Lib - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: > - -B out2 -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64 -DBUILD_XAUDIO_REDIST=ON - -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" - -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 - -DBUILD_SHARED_LIBS=ON - - task: CMake@1 - displayName: CMake (MinGW-W64) Build Shared Lib - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out2 - - task: CMake@1 - displayName: CMake (MinGW-W64) w/ GameInput - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: > - -B out3 -DCMAKE_BUILD_TYPE="Debug" -DDIRECTX_ARCH=x64 -DBUILD_XAUDIO_REDIST=ON -DBUILD_GAMEINPUT=ON - -DCMAKE_CXX_COMPILER="g++.exe" -G "MinGW Makefiles" - -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/ GameInput - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out3 diff --git a/.azuredevops/pipelines/DirectXTK-GitHub-WSL-11.yml b/.azuredevops/pipelines/DirectXTK-GitHub-WSL-11.yml deleted file mode 100644 index aa801baa4..000000000 --- a/.azuredevops/pipelines/DirectXTK-GitHub-WSL-11.yml +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# https://go.microsoft.com/fwlink/?LinkId=248929 - -# Builds the SimpleMath module for Windows Subsystem for Linux (WSL) - -schedules: - - cron: "30 3 * * *" - displayName: 'Nightly build' - branches: - include: - - main - -trigger: none - -pr: - branches: - include: - - main - paths: - include: - - '.azuredevops/pipelines/DirectXTK-GitHub-WSL-11.yml' - - CMake* - - build/*.cmake - - build/*.in - - Inc\SimpleMath.* - - Src\SimpleMath.* - -resources: - repositories: - - repository: self - type: git - ref: refs/heads/main - trigger: none - - repository: dxHeadersRepo - name: Microsoft/DirectX-Headers - type: github - endpoint: microsoft - ref: refs/heads/main - - repository: dxMathRepo - name: Microsoft/DirectXMath - type: github - endpoint: microsoft - ref: refs/heads/main - - repository: testRepo - name: walbourn/directxtktest - type: github - endpoint: microsoft - ref: refs/heads/main - -name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) - -pool: - vmImage: ubuntu-22.04 - -variables: - Codeql.Enabled: false - LOCAL_PKG_DIR: '$(Agent.BuildDirectory)/install/' - SAL_URL: https://raw.githubusercontent.com/dotnet/runtime/v8.0.1/src/coreclr/pal/inc/rt/sal.h - SAL_HASH: 0f5a80b97564217db2ba3e4624cc9eb308e19cc9911dae21d983c4ab37003f4756473297ba81b386c498514cedc1ef5a3553d7002edc09aeb6a1335df973095f - -jobs: - - job: BUILD_SIMPLEMATH - displayName: SimpleMath - timeoutInMinutes: 120 - cancelTimeoutInMinutes: 1 - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: dxHeadersRepo - displayName: Fetch DirectX-Headers - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/DirectX-Headers' - - checkout: dxMathRepo - displayName: Fetch DirectX-Math - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/DirectXMath' - - checkout: testRepo - displayName: Fetch Tests - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/Tests' - - task: CMake@1 - displayName: CMake DirectX-Headers - inputs: - cwd: DirectX-Headers - cmakeArgs: > - . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF - -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) - - task: CMake@1 - displayName: CMake DirectX-Headers (Build) - inputs: - cwd: DirectX-Headers - cmakeArgs: --build . -v - - task: CMake@1 - displayName: CMake DirectX-Headers (Install) - inputs: - cwd: DirectX-Headers - cmakeArgs: --install . - - task: CMake@1 - displayName: CMake DirectXMath - inputs: - cwd: DirectXMath - cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) - - task: CMake@1 - displayName: CMake DirectXMath (Build) - inputs: - cwd: DirectXMath - cmakeArgs: --build . -v - - task: CMake@1 - displayName: CMake DirectXMath (Install) - inputs: - cwd: DirectXMath - cmakeArgs: --install . - - task: PowerShell@2 - displayName: Fetch SAL.H - inputs: - targetType: inline - script: | - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "$(SAL_URL)" -OutFile $(LOCAL_PKG_DIR)/include/sal.h - $fileHash = Get-FileHash -Algorithm SHA512 $(LOCAL_PKG_DIR)/include/sal.h | ForEach { $_.Hash} | Out-String - $filehash = $fileHash.Trim() - Write-Host "##[debug]SHA512: " $filehash - if ($fileHash -ne "$(SAL_HASH)") { - Write-Error -Message "##[error]Computed hash does not match!" -ErrorAction Stop - } - - - task: CMake@1 - displayName: CMake SimpleMath (Config) dbg - inputs: - cwd: Tests/SimpleMathTest - cmakeArgs: > - -B out -DCMAKE_BUILD_TYPE=Debug - -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake - - task: CMake@1 - displayName: CMake SimpleMath (Build) dbg - inputs: - cwd: Tests/SimpleMathTest - cmakeArgs: --build out -v - - task: CMake@1 - displayName: CMake SimpleMath (Config) rel - inputs: - cwd: Tests/SimpleMathTest - cmakeArgs: > - -B out2 -DCMAKE_BUILD_TYPE=Release - -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake - - task: CMake@1 - displayName: CMake SimpleMath (Build) rel - inputs: - cwd: Tests/SimpleMathTest - cmakeArgs: --build out2 -v - - task: CmdLine@2 - displayName: Run tests dbg - inputs: - script: ./out/bin/simplemathtest - workingDirectory: Tests/SimpleMathTest - - task: CmdLine@2 - # This is disabled due to a failure in Vector3 reflect in release mode. - displayName: Run tests rel - enabled: false - inputs: - script: ./out2/bin/simplemathtest - workingDirectory: Tests/SimpleMathTest diff --git a/.azuredevops/pipelines/DirectXTK-GitHub-WSL-13.yml b/.azuredevops/pipelines/DirectXTK-GitHub-WSL-13.yml deleted file mode 100644 index e9be81f0d..000000000 --- a/.azuredevops/pipelines/DirectXTK-GitHub-WSL-13.yml +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# https://go.microsoft.com/fwlink/?LinkId=248929 - -# Builds the SimpleMath module for Windows Subsystem for Linux (WSL) - -schedules: - - cron: "30 3 * * *" - displayName: 'Nightly build' - branches: - include: - - main - -trigger: none - -pr: - branches: - include: - - main - paths: - include: - - '.azuredevops/pipelines/DirectXTK-GitHub-WSL-13.yml' - - CMake* - - build/*.cmake - - build/*.in - - Inc\SimpleMath.* - - Src\SimpleMath.* - -resources: - repositories: - - repository: self - type: git - ref: refs/heads/main - trigger: none - - repository: dxHeadersRepo - name: Microsoft/DirectX-Headers - type: github - endpoint: microsoft - ref: refs/heads/main - - repository: dxMathRepo - name: Microsoft/DirectXMath - type: github - endpoint: microsoft - ref: refs/heads/main - - repository: testRepo - name: walbourn/directxtktest - type: github - endpoint: microsoft - ref: refs/heads/main - -name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) - -pool: - vmImage: ubuntu-24.04 - -variables: - Codeql.Enabled: false - LOCAL_PKG_DIR: '$(Agent.BuildDirectory)/install/' - SAL_URL: https://raw.githubusercontent.com/dotnet/runtime/v8.0.1/src/coreclr/pal/inc/rt/sal.h - SAL_HASH: 0f5a80b97564217db2ba3e4624cc9eb308e19cc9911dae21d983c4ab37003f4756473297ba81b386c498514cedc1ef5a3553d7002edc09aeb6a1335df973095f - -jobs: - - job: BUILD_SIMPLEMATH - displayName: SimpleMath - timeoutInMinutes: 120 - cancelTimeoutInMinutes: 1 - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: dxHeadersRepo - displayName: Fetch DirectX-Headers - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/DirectX-Headers' - - checkout: dxMathRepo - displayName: Fetch DirectX-Math - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/DirectXMath' - - checkout: testRepo - displayName: Fetch Tests - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/Tests' - - task: CMake@1 - displayName: CMake DirectX-Headers - inputs: - cwd: DirectX-Headers - cmakeArgs: > - . -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF - -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) - - task: CMake@1 - displayName: CMake DirectX-Headers (Build) - inputs: - cwd: DirectX-Headers - cmakeArgs: --build . -v - - task: CMake@1 - displayName: CMake DirectX-Headers (Install) - inputs: - cwd: DirectX-Headers - cmakeArgs: --install . - - task: CMake@1 - displayName: CMake DirectXMath - inputs: - cwd: DirectXMath - cmakeArgs: . -DCMAKE_INSTALL_PREFIX=$(LOCAL_PKG_DIR) - - task: CMake@1 - displayName: CMake DirectXMath (Build) - inputs: - cwd: DirectXMath - cmakeArgs: --build . -v - - task: CMake@1 - displayName: CMake DirectXMath (Install) - inputs: - cwd: DirectXMath - cmakeArgs: --install . - - task: PowerShell@2 - displayName: Fetch SAL.H - inputs: - targetType: inline - script: | - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "$(SAL_URL)" -OutFile $(LOCAL_PKG_DIR)/include/sal.h - $fileHash = Get-FileHash -Algorithm SHA512 $(LOCAL_PKG_DIR)/include/sal.h | ForEach { $_.Hash} | Out-String - $filehash = $fileHash.Trim() - Write-Host "##[debug]SHA512: " $filehash - if ($fileHash -ne "$(SAL_HASH)") { - Write-Error -Message "##[error]Computed hash does not match!" -ErrorAction Stop - } - - - task: CMake@1 - displayName: CMake SimpleMath (Config) dbg - inputs: - cwd: Tests/SimpleMathTest - cmakeArgs: > - -B out -DCMAKE_BUILD_TYPE=Debug - -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake - - task: CMake@1 - displayName: CMake SimpleMath (Build) dbg - inputs: - cwd: Tests/SimpleMathTest - cmakeArgs: --build out -v - - task: CMake@1 - displayName: CMake SimpleMath (Config) rel - inputs: - cwd: Tests/SimpleMathTest - cmakeArgs: > - -B out2 -DCMAKE_BUILD_TYPE=Release - -DCMAKE_PREFIX_PATH=$(LOCAL_PKG_DIR)/share;$(LOCAL_PKG_DIR)/cmake - - task: CMake@1 - displayName: CMake SimpleMath (Build) rel - inputs: - cwd: Tests/SimpleMathTest - cmakeArgs: --build out2 -v - - task: CmdLine@2 - displayName: Run tests dbg - inputs: - script: ./out/bin/simplemathtest - workingDirectory: Tests/SimpleMathTest - - task: CmdLine@2 - # This is disabled due to a failure in Vector3 reflect and Viewport unproject in release mode. - displayName: Run tests rel - enabled: false - inputs: - script: ./out2/bin/simplemathtest - workingDirectory: Tests/SimpleMathTest diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml new file mode 100644 index 000000000..5d348c1e7 --- /dev/null +++ b/.github/workflows/mingw.yml @@ -0,0 +1,107 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# +# https://go.microsoft.com/fwlink/?LinkID=324981 + +name: 'CMake (MinGW)' + +on: + push: + branches: "main" + paths-ignore: + - '*.md' + - LICENSE + - '.azuredevops/**' + - '.github/*.md' + - '.nuget/*' + - build/*.cmd + - build/*.props + - build/*.ps1 + - build/*.targets + pull_request: + branches: "main" + paths-ignore: + - '*.md' + - LICENSE + - '.azuredevops/**' + - '.github/*.md' + - '.nuget/*' + - build/*.cmd + - build/*.props + - build/*.ps1 + - build/*.targets + workflow_dispatch: {} + +permissions: + contents: read + +jobs: + build: + runs-on: windows-2022 + + strategy: + fail-fast: false + + matrix: + build_type: [x64-Debug-MinGW, x64-Release-MinGW] + shared: ['OFF', 'ON'] + gameinput: ['OFF', 'ON'] + + steps: + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + + - name: Clone test repository + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + with: + repository: walbourn/directxtktest + path: Tests + ref: main + + - name: 'Install Ninja' + run: choco install ninja + + # Needs Windows SDK for legacy FXC compiler + - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 + with: + arch: x64 + + - name: 'Set triplet' + shell: pwsh + run: | + echo "VCPKG_INSTALLED_DIR=${{ github.workspace }}/build/vcpkg_installed" >> $env:GITHUB_ENV + echo "VCPKG_DEFAULT_TRIPLET=x64-mingw-static" >> $env:GITHUB_ENV + + - name: Get vcpkg commit hash + shell: pwsh + run: | + if ($Env:vcpkgRelease) { + echo "Using vcpkg commit from repo variable..." + $VCPKG_COMMIT_ID = $Env:vcpkgRelease + } + else { + echo "Fetching latest vcpkg commit hash..." + $commit = (git ls-remote https://github.com/microsoft/vcpkg.git HEAD | Select-String -Pattern '([a-f0-9]{40})').Matches.Value + $VCPKG_COMMIT_ID = $commit + } + Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" + echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV + env: + vcpkgRelease: '${{ vars.VCPKG_COMMIT_ID }}' + + - uses: lukka/run-vcpkg@305c06bd4dee21e23dcf142c85c657a993f7aa1a # v11 + with: + runVcpkgInstall: true + vcpkgJsonGlob: '**/build/vcpkg.json' + vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}' + + - name: 'Configure CMake' + working-directory: ${{ github.workspace }} + run: > + cmake --preset=${{ matrix.build_type }} -DBUILD_TESTING=ON + -DBUILD_SHARED_LIBS=${{ matrix.shared }} -DBUILD_GAMEINPUT=${{ matrix.gameinput }} + -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR="${{ github.workspace }}/build" + -DVCPKG_TARGET_TRIPLET="${env:VCPKG_DEFAULT_TRIPLET}" + + - name: 'Build' + working-directory: ${{ github.workspace }} + run: cmake --build out\build\${{ matrix.build_type }} diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml index e0cbf1ca0..5a1b63922 100644 --- a/.github/workflows/vcpkg.yml +++ b/.github/workflows/vcpkg.yml @@ -99,39 +99,14 @@ jobs: arch: amd64_arm64 shared: 'OFF' gameinput: 'OFF' - - toolver: '14' - build_type: x64-Debug-MinGW - arch: amd64 - shared: 'OFF' - gameinput: 'OFF' - - toolver: '14' - build_type: x64-Release-MinGW - arch: amd64 - shared: 'OFF' - gameinput: 'OFF' - - toolver: '14' - build_type: x64-Debug-MinGW - arch: amd64 - shared: 'OFF' - gameinput: 'ON' - toolver: '14' build_type: x64-Debug-VCPKG arch: amd64 shared: 'ON' gameinput: 'ON' - - toolver: '14' - build_type: x64-Debug-MinGW - arch: amd64 - shared: 'ON' - gameinput: 'OFF' - - toolver: '14' - build_type: x64-Release-MinGW - arch: amd64 - shared: 'ON' - gameinput: 'OFF' steps: - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - name: 'Install Ninja' run: choco install ninja @@ -147,14 +122,7 @@ jobs: echo "VCPKG_INSTALLED_DIR=${{ github.workspace }}/build/vcpkg_installed" >> $env:GITHUB_ENV if ("${{ matrix.arch }}" -eq "amd64") { - if ("${{ matrix.build_type }}" -match "MinGW") - { - echo "VCPKG_DEFAULT_TRIPLET=x64-mingw-static" >> $env:GITHUB_ENV - } - else - { - echo "VCPKG_DEFAULT_TRIPLET=x64-windows" >> $env:GITHUB_ENV - } + echo "VCPKG_DEFAULT_TRIPLET=x64-windows" >> $env:GITHUB_ENV } elseif ("${{ matrix.arch }}" -eq "amd64_x86") { diff --git a/Audio/AudioEngine.cpp b/Audio/AudioEngine.cpp index be13452da..dea0b819d 100644 --- a/Audio/AudioEngine.cpp +++ b/Audio/AudioEngine.cpp @@ -561,8 +561,15 @@ HRESULT AudioEngine::Impl::Reset(const WAVEFORMATEX* wfx, const wchar_t* deviceI return hr; } - XAUDIO2FX_REVERB_PARAMETERS native; - ReverbConvertI3DL2ToNative(&gReverbPresets[Reverb_Default], &native); + XAUDIO2FX_REVERB_PARAMETERS native = {}; + ReverbConvertI3DL2ToNative( + &gReverbPresets[Reverb_Default], + &native +#ifdef __MINGW32__ + , FALSE +#endif + ); + hr = mReverbVoice->SetEffectParameters(0, &native, sizeof(XAUDIO2FX_REVERB_PARAMETERS)); if (FAILED(hr)) { @@ -1330,8 +1337,14 @@ void AudioEngine::SetReverb(AUDIO_ENGINE_REVERB reverb) } else { - XAUDIO2FX_REVERB_PARAMETERS native; - ReverbConvertI3DL2ToNative(&gReverbPresets[reverb], &native); + XAUDIO2FX_REVERB_PARAMETERS native = {}; + ReverbConvertI3DL2ToNative( + &gReverbPresets[reverb], + &native +#ifdef __MINGW32__ + , FALSE +#endif + ); pImpl->SetReverb(&native); } } diff --git a/CMakePresets.json b/CMakePresets.json index 4cf2814e8..ebc81a08e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -188,7 +188,7 @@ "name": "MinGW32", "hidden": true, "environment": { - "PATH": "$penv{PATH};c:/mingw32/bin;c:/mingw32/libexec/gcc/i686-w64-mingw32/12.2.0" + "PATH": "$penv{PATH};c:/mingw32/bin;c:/mingw32/libexec/gcc/i686-w64-mingw32/16.1.0" }, "cacheVariables": { "VCPKG_TARGET_TRIPLET": "x86-mingw-static", @@ -199,7 +199,7 @@ "name": "MinGW64", "hidden": true, "environment": { - "PATH": "$penv{PATH};c:/mingw64/bin;c:/mingw64/libexec/gcc/x86_64-w64-mingw32/12.2.0" + "PATH": "$penv{PATH};c:/mingw64/bin;c:/mingw64/libexec/gcc/x86_64-w64-mingw32/16.1.0" }, "cacheVariables": { "VCPKG_TARGET_TRIPLET": "x64-mingw-static",