diff --git a/.azuredevops/pipelines/DirectXTK12-GitHub-CMake-Dev17.yml b/.azuredevops/pipelines/DirectXTK12-GitHub-CMake-Dev17.yml deleted file mode 100644 index 2e9fa0d5..00000000 --- a/.azuredevops/pipelines/DirectXTK12-GitHub-CMake-Dev17.yml +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# http://go.microsoft.com/fwlink/?LinkID=615561 - -# Builds the library using CMake with VS Generator (GitHub Actions covers Ninja). - -schedules: - - cron: "0 6 * * *" - 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 - - build/*.xvd - -pr: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - '.github/**' - - '.nuget/*' - - build/*.cmd - - build/*.json - - build/*.props - - build/*.ps1 - - build/*.targets - - build/*.xvd - 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) - - 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) - - 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) - - 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) - - 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) - - task: CMake@1 - displayName: 'CMake (ClangCl): Build ARM64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out6 -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Config x64' - 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) - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Build x64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out7 -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Build x64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out7 -v --config RelWithDebInfo - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Config ARM64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -A ARM64 -B out8 - -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON - -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Build ARM64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out8 -v --config Debug - - task: CMake@1 - displayName: 'CMake (MSVC Spectre): Build ARM64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out8 -v --config RelWithDebInfo - - task: CMake@1 - displayName: 'CMake (NO_WCHAR_T): Config' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -A x64 -B out9 - -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 out9 -v --config Debug - - task: CMake@1 - displayName: 'CMake (DLL): Config x64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -A x64 -B out10 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_SHARED_LIBS=ON - - task: CMake@1 - displayName: 'CMake (DLL): Build x64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out10 -v --config Debug - - task: CMake@1 - displayName: 'CMake (DLL): Build x64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out10 -v --config RelWithDebInfo diff --git a/.azuredevops/pipelines/DirectXTK12-GitHub-CMake.yml b/.azuredevops/pipelines/DirectXTK12-GitHub-CMake.yml deleted file mode 100644 index 1be6f285..00000000 --- a/.azuredevops/pipelines/DirectXTK12-GitHub-CMake.yml +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# http://go.microsoft.com/fwlink/?LinkID=615561 - -# Builds the library using CMake with VS Generator (GitHub Actions covers Ninja). - -schedules: - - cron: "0 6 * * *" - 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 - - build/*.xvd - -pr: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - '.github/**' - - '.nuget/*' - - build/*.cmd - - build/*.json - - build/*.props - - build/*.ps1 - - build/*.targets - - build/*.xvd - 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) - - 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) - - 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 (NO_WCHAR_T): Config' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -T v142 -A x64 -B out4 - -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 out4 -v --config Debug - - task: CMake@1 - displayName: 'CMake (DLL): Config x64' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: > - -G "$(VS_GENERATOR)" -T v142 -A x64 -B out5 - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) - -DBUILD_SHARED_LIBS=ON - - task: CMake@1 - displayName: 'CMake (DLL): Build x64 Debug' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out5 -v --config Debug - - task: CMake@1 - displayName: 'CMake (DLL): Build x64 Release' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out5 -v --config RelWithDebInfo diff --git a/.azuredevops/pipelines/DirectXTK12-GitHub-Dev17.yml b/.azuredevops/pipelines/DirectXTK12-GitHub-Dev17.yml deleted file mode 100644 index 61408107..00000000 --- a/.azuredevops/pipelines/DirectXTK12-GitHub-Dev17.yml +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# http://go.microsoft.com/fwlink/?LinkID=615561 - -# Builds the library for Windows Desktop and UWP. - -schedules: - - cron: "0 5 * * *" - displayName: 'Nightly build' - branches: - include: - - main - -# GitHub Actions handles MSBuild for CI/PR -trigger: none -pr: - branches: - include: - - main - paths: - include: - - '.azuredevops/pipelines/DirectXTK12-GitHub-Dev17.yml' - - Src/Shaders/CompileShaders.cmd - -resources: - repositories: - - repository: self - type: git - ref: refs/heads/main - -name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) - -variables: - Codeql.Enabled: false - -pool: - vmImage: windows-2022 - -jobs: - - job: UWP_BUILD - displayName: 'Universal Windows Platform (UWP)' - timeoutInMinutes: 120 - cancelTimeoutInMinutes: 1 - strategy: - maxParallel: 3 - matrix: - Release_arm64: - BuildPlatform: ARM64 - BuildConfiguration: Release - Debug_arm64: - BuildPlatform: ARM64 - BuildConfiguration: Debug - Release_x64: - BuildPlatform: x64 - BuildConfiguration: Release - Debug_x64: - BuildPlatform: x64 - BuildConfiguration: Debug - Release_x86: - BuildPlatform: x86 - BuildConfiguration: Release - Debug_x86: - BuildPlatform: x86 - BuildConfiguration: Debug - steps: - - checkout: self - clean: true - fetchTags: false - - task: MSBuild@1 - displayName: Log Information - inputs: - solution: build/LogInfo.targets - platform: '$(BuildPlatform)' - configuration: '$(BuildConfiguration)' - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Windows10_2022.sln - inputs: - solution: DirectXTK_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: '$(BuildPlatform)' - configuration: '$(BuildConfiguration)' - msbuildArchitecture: x64 diff --git a/.azuredevops/pipelines/DirectXTK12-GitHub-MinGW.yml b/.azuredevops/pipelines/DirectXTK12-GitHub-MinGW.yml deleted file mode 100644 index 1d34b3a1..00000000 --- a/.azuredevops/pipelines/DirectXTK12-GitHub-MinGW.yml +++ /dev/null @@ -1,281 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# https://go.microsoft.com/fwlink/?LinkID=615561 - -# Builds the library and test suite using the MinGW compiler. - -schedules: - - cron: "0 6 * * *" - 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 - - build/*.xvd - -pr: - branches: - include: - - main - paths: - exclude: - - '*.md' - - LICENSE - - '.github/**' - - '.nuget/*' - - build/*.cmd - - build/OneFuzz*.json - - build/*.props - - build/*.ps1 - - build/*.targets - - build/*.xvd - 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/directxtk12test - 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: DIRECTX_DXC_DIR - value: '$(Build.SourcesDirectory)/vcpkg/installed/x64-mingw-static/tools/directx-dxc' - - 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' - -jobs: - - job: MINGW32_BUILD - displayName: 'Minimalist GNU for Windows (MinGW32) BUILD_TESTING=ON' - 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 - # Note we have to use x64-mingw-static for the host to use the directx-dxc port. - 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;]x64-mingw-static - - workingDirectory: $(Build.SourcesDirectory)\vcpkg - - task: PowerShell@2 - displayName: Install MinGW32 - 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" - - workingDirectory: $(Build.SourcesDirectory) - - task: PowerShell@2 - displayName: Setup for Windows 11 SDK - inputs: - targetType: inline - script: | - $sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10 - $wsdkarchlib = "{0}lib\$(WIN11_SDK)\um\x86" -f $sdkroot - if (Test-Path "$wsdkarchlib") { - Write-Host "##vso[task.setvariable variable=WindowsSdkDir;]$sdkroot" - Write-Host "##vso[task.setvariable variable=LIB;]$wsdkarchlib" - } - 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: 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" - -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" - -DVCPKG_TARGET_TRIPLET=x86-mingw-static - -DVCPKG_HOST_TRIPLET=x64-mingw-static -DDIRECTX_DXC_PATH="$(DIRECTX_DXC_DIR)" - - 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 Windows 11 SDK - inputs: - targetType: inline - script: | - $sdkroot = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows Kits\Installed Roots' | Select-Object -ExpandProperty KitsRoot10 - $wsdkarchlib = "{0}lib\$(WIN11_SDK)\um\x64" -f $sdkroot - if (Test-Path "$wsdkarchlib") { - Write-Host "##vso[task.setvariable variable=WindowsSdkDir;]$sdkroot" - Write-Host "##vso[task.setvariable variable=LIB;]$wsdkarchlib" - } - 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: 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" - -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" - -DVCPKG_TARGET_TRIPLET=x64-mingw-static - -DVCPKG_HOST_TRIPLET=x64-mingw-static -DDIRECTX_DXC_PATH="$(DIRECTX_DXC_DIR)" - - 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" - -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" - -DVCPKG_TARGET_TRIPLET=x64-mingw-static - -DVCPKG_HOST_TRIPLET=x64-mingw-static -DDIRECTX_DXC_PATH="$(DIRECTX_DXC_DIR)" - -DBUILD_SHARED_LIBS=ON - - task: CMake@1 - displayName: CMake (MinGW-W64) Build as 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" - -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" - -DVCPKG_TARGET_TRIPLET=x64-mingw-static - -DVCPKG_HOST_TRIPLET=x64-mingw-static -DDIRECTX_DXC_PATH="$(DIRECTX_DXC_DIR)" - - task: CMake@1 - displayName: CMake (MinGW-W64) Build w/ GameInput - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out3 diff --git a/.azuredevops/pipelines/DirectXTK12-GitHub-Test-Dev17.yml b/.azuredevops/pipelines/DirectXTK12-GitHub-Test-Dev17.yml deleted file mode 100644 index abdae5d7..00000000 --- a/.azuredevops/pipelines/DirectXTK12-GitHub-Test-Dev17.yml +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# Licensed under the MIT License. -# -# https://go.microsoft.com/fwlink/?LinkID=615561 - -# Builds the library and test suite. - -schedules: - - cron: "30 5 * * *" - displayName: 'Nightly build' - branches: - include: - - main - -# GitHub Actions handles test suite for CI/PR -trigger: none -pr: - branches: - include: - - main - paths: - include: - - '.azuredevops/pipelines/DirectXTK12-GitHub-Test-Dev17.yml' - -resources: - repositories: - - repository: self - type: git - ref: refs/heads/main - - repository: testRepo - name: walbourn/directxtk12test - 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: VC_PATH - value: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC' - - name: GUID_FEED - value: $(ADOFeedGUID) - -jobs: - - job: UWP_BUILD - displayName: 'Universal Windows Platform (UWP)' - timeoutInMinutes: 120 - cancelTimeoutInMinutes: 1 - strategy: - maxParallel: 3 - matrix: - Release_arm64: - BuildPlatform: ARM64 - BuildConfiguration: Release - Debug_arm64: - BuildPlatform: ARM64 - BuildConfiguration: Debug - Release_x64: - BuildPlatform: x64 - BuildConfiguration: Release - Debug_x64: - BuildPlatform: x64 - BuildConfiguration: Debug - Release_x86: - BuildPlatform: x86 - BuildConfiguration: Release - Debug_x86: - BuildPlatform: x86 - BuildConfiguration: Debug - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: testRepo - displayName: Fetch Tests - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/Tests' - - task: NuGetToolInstaller@1 - displayName: 'Use NuGet' - - task: NuGetAuthenticate@1 - displayName: 'NuGet Auth' - - task: NuGetCommand@2 - displayName: NuGet restore tests - inputs: - solution: Tests/D3D12Test/packages.config - feedRestore: $(GUID_FEED) - includeNuGetOrg: false - packagesDirectory: ../packages - - task: MSBuild@1 - displayName: Log Information - inputs: - solution: build/LogInfo.targets - platform: '$(BuildPlatform)' - configuration: '$(BuildConfiguration)' - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTK_Tests_Windows10.sln - inputs: - solution: Tests/DirectXTK_Tests_Windows10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 /p:AppxBundle=Never - platform: '$(BuildPlatform)' - configuration: '$(BuildConfiguration)' - - - job: CMAKE_BUILD_X64 - displayName: 'CMake for X64 BUILD_TESTING=ON' - timeoutInMinutes: 60 - workspace: - clean: all - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: testRepo - displayName: Fetch Tests - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/Tests' - - task: CmdLine@2 - displayName: Setup environment for CMake to use VS - inputs: - script: | - call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat" - echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath% - echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja - echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin - echo ##vso[task.prependpath]%WindowsSdkBinPath%x64 - echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64 - echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\x64 - echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE% - echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE% - echo ##vso[task.setvariable variable=LIB;]%LIB% - - - task: CMake@1 - displayName: CMake (MSVC; x64-Debug) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=x64-Debug - - task: CMake@1 - displayName: CMake (MSVC; x64-Debug) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/x64-Debug -v - - task: DeleteFiles@1 - inputs: - Contents: 'out' - - task: CMake@1 - displayName: CMake (MSVC; x64-Release) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=x64-Release - - task: CMake@1 - displayName: CMake (MSVC; x64-Release) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/x64-Release -v - - task: DeleteFiles@1 - inputs: - Contents: 'out' - - task: CMake@1 - displayName: CMake (clang/LLVM; x64-Debug) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=x64-Debug-Clang - - task: CMake@1 - displayName: CMake (clang/LLVM; x64-Debug) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/x64-Debug-Clang -v - - task: DeleteFiles@1 - inputs: - Contents: 'out' - - task: CMake@1 - displayName: CMake (clang/LLVM; x64-Release) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=x64-Release-Clang - - task: CMake@1 - displayName: CMake (clang/LLVM; x64-Release) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/x64-Release-Clang -v - - - job: CMAKE_BUILD_ARM64 - displayName: 'CMake for ARM64 BUILD_TESTING=ON' - timeoutInMinutes: 60 - workspace: - clean: all - steps: - - checkout: self - clean: true - fetchTags: false - fetchDepth: 1 - path: 's' - - checkout: testRepo - displayName: Fetch Tests - clean: true - fetchTags: false - fetchDepth: 1 - path: 's/Tests' - - task: CmdLine@2 - displayName: Setup environment for CMake to use VS - inputs: - script: | - call "$(VC_PATH)\Auxiliary\Build\vcvarsamd64_arm64.bat" - echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath% - echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja - echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin - echo ##vso[task.prependpath]%WindowsSdkBinPath%x64 - echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64 - echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\arm64 - echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE% - echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE% - echo ##vso[task.setvariable variable=LIB;]%LIB% - - - task: CMake@1 - displayName: CMake (MSVC; arm64-Debug) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=arm64-Debug - - task: CMake@1 - displayName: CMake (MSVC; arm64-Debug) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/arm64-Debug -v - - task: DeleteFiles@1 - inputs: - Contents: 'out' - - task: CMake@1 - displayName: CMake (MSVC; arm64-Release) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=arm64-Release - - task: CMake@1 - displayName: CMake (MSVC; arm64-Release) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/arm64-Release -v - - task: DeleteFiles@1 - inputs: - Contents: 'out' - - task: CMake@1 - displayName: CMake (clang/LLVM; arm64-Debug) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=arm64-Debug-Clang - - task: CMake@1 - displayName: CMake (clang/LLVM; arm64-Debug) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/arm64-Debug-Clang -v - - task: DeleteFiles@1 - inputs: - Contents: 'out' - - task: CMake@1 - displayName: CMake (clang/LLVM; arm64-Release) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=arm64-Release-Clang - - task: CMake@1 - displayName: CMake (clang/LLVM; arm64-Release) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/arm64-Release-Clang -v - - task: DeleteFiles@1 - inputs: - Contents: 'out' - - task: CMake@1 - displayName: CMake (MSVC; arm64ec-Debug) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=arm64ec-Debug - - task: CMake@1 - displayName: CMake (MSVC; arm64ec-Debug) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/arm64ec-Debug -v - - task: DeleteFiles@1 - inputs: - Contents: 'out' - - task: CMake@1 - displayName: CMake (MSVC; arm64ec-Release) Config - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --preset=arm64ec-Release - - task: CMake@1 - displayName: CMake (MSVC; arm64ec-Release) Build - inputs: - cwd: $(Build.SourcesDirectory) - cmakeArgs: --build out/build/arm64ec-Release -v diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml new file mode 100644 index 00000000..38955fe4 --- /dev/null +++ b/.github/workflows/mingw.yml @@ -0,0 +1,109 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# +# http://go.microsoft.com/fwlink/?LinkID=615561 + +name: 'CMake (MinGW)' + +on: + push: + branches: "main" + paths-ignore: + - '*.md' + - LICENSE + - '.azuredevops/**' + - '.github/*.md' + - build/*.cmd + - build/*.props + - build/*.ps1 + - build/*.targets + - build/*.xvd + + pull_request: + branches: "main" + paths-ignore: + - '*.md' + - LICENSE + - '.azuredevops/**' + - '.github/*.md' + - build/*.cmd + - build/*.props + - build/*.ps1 + - build/*.targets + - build/*.xvd + 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/directxtk12test + path: Tests + ref: main + + - name: 'Install Ninja' + run: choco install ninja + + # Until MinGW 16 is in the runner image, libd3d12.a is not available, so we need to use the MSVC toolset to build the tests. + - 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/testuwp.yml b/.github/workflows/testuwp.yml new file mode 100644 index 00000000..298f2bc2 --- /dev/null +++ b/.github/workflows/testuwp.yml @@ -0,0 +1,67 @@ +# Copyright (c) Microsoft Corporation. +# Licensed under the MIT License. +# +# http://go.microsoft.com/fwlink/?LinkID=615561 + +name: MSBuild (UWP Tests) + +on: + push: + branches: "main" + paths-ignore: + - '*.md' + - LICENSE + - '.azuredevops/**' + - '.github/*.md' + - '.nuget/*' + - build/* + pull_request: + branches: "main" + paths-ignore: + - '*.md' + - LICENSE + - '.azuredevops/**' + - '.github/*.md' + - '.nuget/*' + - build/* + +permissions: + contents: read + +jobs: + build: + runs-on: windows-2022 + + strategy: + fail-fast: false + + matrix: + build_type: [Debug, Release] + platform: [x86, x64, ARM64] + + steps: + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + + - name: Clone test repository + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + with: + repository: walbourn/directxtk12test + path: Tests + ref: main + + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0 + with: + msbuild-architecture: x64 + + - name: 'NuGet Restore' + working-directory: ${{ github.workspace }}/Tests + run: > + nuget restore DirectXTK_Tests_Windows10.sln -Verbosity detailed -NonInteractive -Source https://api.nuget.org/v3/index.json + + - name: 'Build (UWP)' + working-directory: ${{ github.workspace }}/Tests + run: > + msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }} + /p:AppxPackage=false + DirectXTK_Tests_Windows10.sln diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml index 4aa4fcec..b92bc4e8 100644 --- a/.github/workflows/vcpkg.yml +++ b/.github/workflows/vcpkg.yml @@ -100,39 +100,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 @@ -148,14 +123,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 be13452d..dea0b819 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 58a3a17d..720f37fd 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -233,7 +233,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", @@ -245,7 +245,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", diff --git a/Src/ResourceUploadBatch.cpp b/Src/ResourceUploadBatch.cpp index 30abcb78..308b291f 100644 --- a/Src/ResourceUploadBatch.cpp +++ b/Src/ResourceUploadBatch.cpp @@ -17,7 +17,7 @@ using namespace DirectX; using Microsoft::WRL::ComPtr; -#ifdef __MINGW32__ +#if defined(__MINGW32__) && (__GNUC__ < 16) const GUID IID_ID3D12Device = { 0x189819f1, 0x1db6, 0x4b57, { 0xbe, 0x54, 0x18, 0x21, 0x33, 0x9b, 0x85, 0xf7 } }; #endif