mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-24 01:04:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-0.12

Browse Source
This commit is contained in:
David Reid
2025-08-23 09:54:51 +10:00
parent 5384cfaf12 70eb06d3bd
commit 8030f3bf7b
2 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+33 -22
View File
@@ -494,12 +494,12 @@ if (UNIX)
find_library(LIB_PTHREAD NAMES pthread) find_library(LIB_PTHREAD NAMES pthread)
if(LIB_PTHREAD) if(LIB_PTHREAD)
list(APPEND COMMON_LINK_LIBRARIES pthread) # Some compilers will not link to pthread by default so list it here just in case. list(APPEND COMMON_LINK_LIBRARIES ${LIB_PTHREAD}) # Some compilers will not link to pthread by default so list it here just in case.
endif() endif()
find_library(LIB_M NAMES m) find_library(LIB_M NAMES m)
if(LIB_M) if(LIB_M)
list(APPEND COMMON_LINK_LIBRARIES m) list(APPEND COMMON_LINK_LIBRARIES ${LIB_M})
endif() endif()
# If we're compiling for 32-bit ARM we need to link to -latomic. # If we're compiling for 32-bit ARM we need to link to -latomic.
@@ -660,10 +660,13 @@ set(LINKED_LIBS)
if(MINIAUDIO_NO_RUNTIME_LINKING) if(MINIAUDIO_NO_RUNTIME_LINKING)
is_backend_enabled(PULSEAUDIO) is_backend_enabled(PULSEAUDIO)
if (PULSEAUDIO_ENABLED) if (PULSEAUDIO_ENABLED)
find_package(PulseAudio REQUIRED) find_package(PulseAudio)
target_link_libraries(miniaudio PRIVATE ${PULSEAUDIO_LIBRARY})
target_include_directories(miniaudio SYSTEM PRIVATE ${PULSEAUDIO_INCLUDE_DIR}) if (PulseAudio_FOUND)
list(APPEND LINKED_LIBS libpulse) target_link_libraries(miniaudio PRIVATE ${PULSEAUDIO_LIBRARY})
target_include_directories(miniaudio SYSTEM PRIVATE ${PULSEAUDIO_INCLUDE_DIR})
list(APPEND LINKED_LIBS libpulse)
endif()
endif() endif()
is_backend_enabled(ALSA) is_backend_enabled(ALSA)
@@ -678,14 +681,17 @@ if(MINIAUDIO_NO_RUNTIME_LINKING)
NAMES asound NAMES asound
HINTS ${PC_ALSA_LIBRARY_DIRS} HINTS ${PC_ALSA_LIBRARY_DIRS}
) )
find_path(ALSA_INCLUDE_DIR
NAMES alsa/asoundlib.h
HINTS ${PC_ALSA_INCLUDE_DIRS}
)
target_link_libraries(miniaudio PRIVATE ${ALSA_LIBRARY}) if (ALSA_LIBRARY)
target_include_directories(miniaudio PRIVATE ${ALSA_INCLUDE_DIR}) find_path(ALSA_INCLUDE_DIR
list(APPEND LINKED_LIBS alsa) NAMES alsa/asoundlib.h
HINTS ${PC_ALSA_INCLUDE_DIRS}
)
target_link_libraries(miniaudio PRIVATE ${ALSA_LIBRARY})
target_include_directories(miniaudio PRIVATE ${ALSA_INCLUDE_DIR})
list(APPEND LINKED_LIBS alsa)
endif()
endif() endif()
is_backend_enabled(SNDIO) is_backend_enabled(SNDIO)
@@ -700,8 +706,11 @@ if(MINIAUDIO_NO_RUNTIME_LINKING)
NAMES sndio NAMES sndio
HINTS ${PC_SNDIO_LIBRARY_DIRS} HINTS ${PC_SNDIO_LIBRARY_DIRS}
) )
target_link_libraries(miniaudio PRIVATE ${SNDIO_LIBRARY})
list(APPEND LINKED_LIBS sndio) if (SNDIO_LIBRARY)
target_link_libraries(miniaudio PRIVATE ${SNDIO_LIBRARY})
list(APPEND LINKED_LIBS sndio)
endif()
endif() endif()
is_backend_enabled(JACK) is_backend_enabled(JACK)
@@ -717,14 +726,16 @@ if(MINIAUDIO_NO_RUNTIME_LINKING)
HINTS ${PC_JACK_LIBRARY_DIRS} HINTS ${PC_JACK_LIBRARY_DIRS}
) )
find_path(JACK_INCLUDE_DIR if (JACK_LIBRARY)
NAMES jack/jack.h find_path(JACK_INCLUDE_DIR
HINTS ${PC_JACK_INCLUDE_DIRS} NAMES jack/jack.h
) HINTS ${PC_JACK_INCLUDE_DIRS}
)
target_link_libraries(miniaudio PRIVATE ${JACK_LIBRARY}) target_link_libraries(miniaudio PRIVATE ${JACK_LIBRARY})
target_include_directories(miniaudio PRIVATE ${JACK_INCLUDE_DIR}) target_include_directories(miniaudio PRIVATE ${JACK_INCLUDE_DIR})
list(APPEND LINKED_LIBS jack) list(APPEND LINKED_LIBS jack)
endif()
endif() endif()
endif() endif()
miniaudio.h
+6 -5
View File
@@ -3966,12 +3966,13 @@ typedef ma_uint16 wchar_t;
#endif #endif
#endif #endif
#if defined(__has_c_attribute) #if !defined(MA_FALLTHROUGH) && defined(__cplusplus) && __cplusplus >= 201703L
#if __has_c_attribute(fallthrough) #define MA_FALLTHROUGH [[fallthrough]]
#define MA_FALLTHROUGH [[fallthrough]]
#endif
#endif #endif
#if !defined(MA_FALLTHROUGH) && defined(__has_attribute) && (defined(__clang__) || defined(__GNUC__)) #if !defined(MA_FALLTHROUGH) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202000L
#define MA_FALLTHROUGH [[fallthrough]]
#endif
#if !defined(MA_FALLTHROUGH) && defined(__has_attribute)
#if __has_attribute(fallthrough) #if __has_attribute(fallthrough)
#define MA_FALLTHROUGH __attribute__((fallthrough)) #define MA_FALLTHROUGH __attribute__((fallthrough))
#endif #endif