Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/actions/setup-deps/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ runs:
shell: pwsh
run: |
# Windows SDK (D3D11/D3D12) is pre-installed on GitHub runners.
# We need LLVM/Clang and Ninja.
choco install llvm ninja -y
# Upgrade LLVM so Clang matches the runner's MSVC STL requirement (Clang 22+ for VS 2026 / MSVC 14.52+),
# and ensure Ninja is installed.
choco upgrade llvm -y
choco install ninja -y
"C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8
"C:\ProgramData\chocolatey\bin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8
# Ensure ccache is removed from Chocolatey bin on Windows runners as it breaks clang-cl RC compilation
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:
uses: actions/cache@v5
with:
path: ~/.cache/cmake_deps
key: ${{ runner.os }}-cmake-deps-v2-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
key: ${{ runner.os }}-cmake-deps-v2-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake', '**/*.patch') }}
restore-keys: |
${{ runner.os }}-cmake-deps-v2-

Expand Down
7 changes: 4 additions & 3 deletions thirdparty/openal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ gpStartThirdparty("openal" VERSION "1.25.3")
)

gpThirdpartySource(
URL "https://github.com/kcat/openal-soft/archive/dc98bfbe6064d851e32428db83b06732a448810b.tar.gz"
HASH "SHA256=af1096b79f488724ca068a9d3632f05eb56897c6d3ce0984c946ece512ddb020"
TARGET "OpenAL"
URL "https://github.com/kcat/openal-soft/archive/dc98bfbe6064d851e32428db83b06732a448810b.tar.gz"
HASH "SHA256=af1096b79f488724ca068a9d3632f05eb56897c6d3ce0984c946ece512ddb020"
TARGET "OpenAL"
PATCH_COMMAND git --git-dir= apply "${CMAKE_CURRENT_SOURCE_DIR}/patches/fix_msvc_unique_ptr_transform.patch"
)

gpThirdpartySetCMakeArgs(
Expand Down
13 changes: 13 additions & 0 deletions thirdparty/openal/patches/fix_msvc_unique_ptr_transform.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 1111111..2222222 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -1781,7 +1781,7 @@ void UpdateDeviceParams(al::Device *device, std::span<int const> const attrList)
* configuration in aluInitEffectPanning.
*/
std::ranges::for_each(context->mEffectSlotClusters
- | std::views::transform(&ContextBase::EffectSlotCluster::operator*)
+ | std::views::transform([](auto &cluster) -> auto & { return *cluster; })
| std::views::join, [](EffectSlotBase &slot)
{
slot.mWetBuffer.clear();
Loading