From bacabb8f2b488b3da58dc3ea4159326298a003f6 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 12 Nov 2024 15:53:02 -0500 Subject: Android cross-compile Signed-off-by: Andrew Opalach --- src/mixer/audio_miniaudio.c | 15 ++++++++++----- src/mixer/meson.build | 7 ++++--- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'src/mixer') diff --git a/src/mixer/audio_miniaudio.c b/src/mixer/audio_miniaudio.c index 7db1b5a..2f98335 100644 --- a/src/mixer/audio_miniaudio.c +++ b/src/mixer/audio_miniaudio.c @@ -17,12 +17,17 @@ _Pragma("GCC diagnostic pop") #endif static ma_backend backends[] = { -#ifndef _WIN32 +#ifdef MA_ENABLE_PULSEAUDIO ma_backend_pulseaudio, - ma_backend_alsa -#else - ma_backend_wasapi -// ma_backend_dsound +#endif +#ifdef MA_ENABLE_ALSA + ma_backend_alsa, +#endif +#ifdef MA_ENABLE_WASAPI + ma_backend_wasapi, +#endif +#ifdef MA_ENABLE_AAUDIO + ma_backend_aaudio, #endif }; diff --git a/src/mixer/meson.build b/src/mixer/meson.build index f3ea6c7..0a2e9d7 100644 --- a/src/mixer/meson.build +++ b/src/mixer/meson.build @@ -16,14 +16,15 @@ if use_miniaudio '-DMA_NO_ENGINE', '-DMA_NO_GENERATION', ] - if not is_windows + if is_linux libpulse = dependency('libpulse') alsa = dependency('alsa') mixer_deps += [libpulse, alsa] mixer_args += ['-DMA_ENABLE_ALSA', '-DMA_ENABLE_PULSEAUDIO', '-DMA_NO_RUNTIME_LINKING'] - else + elif is_windows mixer_args += ['-DMA_ENABLE_WASAPI'] - #mixer_args += ['-DMA_ENABLE_DSOUND'] + elif is_android + mixer_args += ['-DMA_ENABLE_AAUDIO'] endif else mixer_src += ['audio_null.c'] -- cgit v1.2.3-101-g0448