From 863eda6c45a0ed0bf5f460dde6177c257d57cff8 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 15 Jan 2024 20:52:07 -0500 Subject: Major build improvments (Windows sink) - This commit won't run correctly because the signedness change is not handled by bimu server yet. Signed-off-by: Andrew Opalach --- src/mixer/meson.build | 11 ++++++----- src/mixer/mixer.c | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mixer') diff --git a/src/mixer/meson.build b/src/mixer/meson.build index 53389eb..52125ce 100644 --- a/src/mixer/meson.build +++ b/src/mixer/meson.build @@ -4,10 +4,6 @@ mixer_deps = [common_deps] miniaudio = subproject('miniaudio').get_variable('miniaudio') mixer_src += ['audio_miniaudio.c'] mixer_deps += [miniaudio] -if host_machine.system() != 'windows' - libpulse = dependency('libpulse') - mixer_deps += [libpulse] -endif miniaudio_args = [ '-DMA_NO_JACK', @@ -18,8 +14,13 @@ miniaudio_args = [ '-DMA_NO_RESOURCE_MANAGER', '-DMA_NO_NODE_GRAPH', '-DMA_NO_ENGINE', - '-DMA_NO_RUNTIME_LINKING' ] +if not is_windows + libpulse = dependency('libpulse') + mixer_deps += [libpulse] + miniaudio_args += ['-DMA_NO_RUNTIME_LINKING'] +endif + mixer = declare_dependency(sources: mixer_src, dependencies: mixer_deps, compile_args: miniaudio_args) diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c index 646f056..663e7aa 100644 --- a/src/mixer/mixer.c +++ b/src/mixer/mixer.c @@ -1,5 +1,4 @@ #include "../buffer/audio.h" -#include "../buffer/clock.h" #include "mixer.h" -- cgit v1.2.3-101-g0448