From ea59076ba9dd96a3dd5919e89eef459665e3ed4c Mon Sep 17 00:00:00 2001 From: David Reid Date: Sat, 23 Aug 2025 08:33:53 +1000 Subject: [PATCH 1/3] Try fixing a warning with MA_FALLTHROUGH. --- miniaudio.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/miniaudio.h b/miniaudio.h index 89de43b0..5be4e1ac 100644 --- a/miniaudio.h +++ b/miniaudio.h @@ -3953,12 +3953,13 @@ typedef ma_uint16 wchar_t; #endif #endif -#if defined(__has_c_attribute) - #if __has_c_attribute(fallthrough) - #define MA_FALLTHROUGH [[fallthrough]] - #endif +#if !defined(MA_FALLTHROUGH) && defined(__cplusplus) && __cplusplus >= 201703L + #define MA_FALLTHROUGH [[fallthrough]] #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) #define MA_FALLTHROUGH __attribute__((fallthrough)) #endif From 959283f2440205f831457bdf1ce73fe90e09af97 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Fri, 22 Aug 2025 17:31:00 +0200 Subject: [PATCH 2/3] Ignore missing library dependencies in CMake Signed-off-by: Marcin Serwin --- CMakeLists.txt | 51 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bae593e..975993a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -616,10 +616,13 @@ set(LINKED_LIBS) if(MINIAUDIO_NO_RUNTIME_LINKING) is_backend_enabled(PULSEAUDIO) if (PULSEAUDIO_ENABLED) - find_package(PulseAudio REQUIRED) - target_link_libraries(miniaudio PRIVATE ${PULSEAUDIO_LIBRARY}) - target_include_directories(miniaudio SYSTEM PRIVATE ${PULSEAUDIO_INCLUDE_DIR}) - list(APPEND LINKED_LIBS libpulse) + find_package(PulseAudio) + + if (PulseAudio_FOUND) + target_link_libraries(miniaudio PRIVATE ${PULSEAUDIO_LIBRARY}) + target_include_directories(miniaudio SYSTEM PRIVATE ${PULSEAUDIO_INCLUDE_DIR}) + list(APPEND LINKED_LIBS libpulse) + endif() endif() is_backend_enabled(ALSA) @@ -634,14 +637,17 @@ if(MINIAUDIO_NO_RUNTIME_LINKING) NAMES asound 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}) - target_include_directories(miniaudio PRIVATE ${ALSA_INCLUDE_DIR}) - list(APPEND LINKED_LIBS alsa) + if (ALSA_LIBRARY) + find_path(ALSA_INCLUDE_DIR + 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() is_backend_enabled(SNDIO) @@ -656,8 +662,11 @@ if(MINIAUDIO_NO_RUNTIME_LINKING) NAMES sndio 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() is_backend_enabled(JACK) @@ -673,14 +682,16 @@ if(MINIAUDIO_NO_RUNTIME_LINKING) HINTS ${PC_JACK_LIBRARY_DIRS} ) - find_path(JACK_INCLUDE_DIR - NAMES jack/jack.h - HINTS ${PC_JACK_INCLUDE_DIRS} - ) + if (JACK_LIBRARY) + find_path(JACK_INCLUDE_DIR + NAMES jack/jack.h + HINTS ${PC_JACK_INCLUDE_DIRS} + ) - target_link_libraries(miniaudio PRIVATE ${JACK_LIBRARY}) - target_include_directories(miniaudio PRIVATE ${JACK_INCLUDE_DIR}) - list(APPEND LINKED_LIBS jack) + target_link_libraries(miniaudio PRIVATE ${JACK_LIBRARY}) + target_include_directories(miniaudio PRIVATE ${JACK_INCLUDE_DIR}) + list(APPEND LINKED_LIBS jack) + endif() endif() endif() From 70eb06d3bdce1ca09e65de33d620f9311a890ee2 Mon Sep 17 00:00:00 2001 From: David Reid Date: Sat, 23 Aug 2025 09:54:32 +1000 Subject: [PATCH 3/3] CMake: Minor fix for pthread and m. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 975993a7..ab9f7581 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -483,12 +483,12 @@ if (UNIX) find_library(LIB_PTHREAD NAMES 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() find_library(LIB_M NAMES m) if(LIB_M) - list(APPEND COMMON_LINK_LIBRARIES m) + list(APPEND COMMON_LINK_LIBRARIES ${LIB_M}) endif() # If we're compiling for 32-bit ARM we need to link to -latomic.