Skip to content

Commit bd2b61d

Browse files
authored
Update openal-soft to 1.25.2 (#3154)
The attribute [[clang::nonblocking]] used by openal-soft is non-standard and may not provide functional benefit here, so disabling it avoids compatibility issues without affecting behavior.
1 parent 61cd7ed commit bd2b61d

162 files changed

Lines changed: 5885 additions & 3827 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3rdparty/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ if(AX_ENABLE_AUDIO)
270270
# The openal-soft(LGPL 2.1)
271271
if(NOT EMSCRIPTEN)
272272
set(alsoft_opts
273+
"ALSOFT_ENABLE_MODULES OFF"
273274
"ALSOFT_DLOPEN OFF"
274275
"ALSOFT_UTILS OFF"
275276
"ALSOFT_EXAMPLES OFF"

3rdparty/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,13 @@
183183

184184
## OpenAL Soft
185185
- [![Upstream](https://img.shields.io/github/v/release/kcat/openal-soft?label=Upstream)](https://github.com/kcat/openal-soft)
186-
- Version: 1.25.1-b2255be
186+
- Version: 1.25.2
187187
- Modifications:
188188
- Remove `-Werror=undef`
189189
- Linking `fmt::fmt` instead `alsoft::fmt`
190190
- Exclude target `alsoft::excommon`
191191
- Fix `al::char_as_u8/al::u8_as_char` in `common/alstring.hpp` with compiler flag: `-fno-char8_t` or `/Zc:char8_t-`
192+
- Disable non‑standard [[clang::nonblocking]] attribute on Win32 to avoid compiler compatibility issues
192193
- License: LGPL-2.1
193194

194195
## OpenSSL

3rdparty/jolt/Jolt/Jolt.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ else()
10261026
endif()
10271027

10281028
# On Unix flavors we need the pthread library
1029-
if (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") AND NOT EMSCRIPTEN)
1029+
if (NOT ("${CMAKE_SYSTEM_NAME}" MATCHES "Windows") AND NOT EMSCRIPTEN)
10301030
target_compile_options(Jolt PUBLIC -pthread)
10311031
target_link_options(Jolt PUBLIC -pthread)
10321032
endif()

0 commit comments

Comments
 (0)