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
1 change: 1 addition & 0 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ if(AX_ENABLE_AUDIO)
# The openal-soft(LGPL 2.1)
if(NOT EMSCRIPTEN)
set(alsoft_opts
"ALSOFT_ENABLE_MODULES OFF"
"ALSOFT_DLOPEN OFF"
"ALSOFT_UTILS OFF"
"ALSOFT_EXAMPLES OFF"
Expand Down
3 changes: 2 additions & 1 deletion 3rdparty/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,13 @@

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

## OpenSSL
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/jolt/Jolt/Jolt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ else()
endif()

# On Unix flavors we need the pthread library
if (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") AND NOT EMSCRIPTEN)
if (NOT ("${CMAKE_SYSTEM_NAME}" MATCHES "Windows") AND NOT EMSCRIPTEN)
target_compile_options(Jolt PUBLIC -pthread)
target_link_options(Jolt PUBLIC -pthread)
endif()
Expand Down
Loading
Loading