summaryrefslogtreecommitdiff
path: root/src/mixer
diff options
context:
space:
mode:
authorAndrew Opalach <andrew@akon.city> 2024-01-15 20:52:07 -0500
committerAndrew Opalach <andrew@akon.city> 2024-01-15 20:52:07 -0500
commit863eda6c45a0ed0bf5f460dde6177c257d57cff8 (patch)
tree231d1e7a4dc62e365152a205de82feab3dcb11cd /src/mixer
parentbe3367fdbfaf7b62b94105cd55d1b9f1e30e9e58 (diff)
downloadcamu-863eda6c45a0ed0bf5f460dde6177c257d57cff8.tar.gz
camu-863eda6c45a0ed0bf5f460dde6177c257d57cff8.tar.bz2
camu-863eda6c45a0ed0bf5f460dde6177c257d57cff8.zip
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 <andrew@akon.city>
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/meson.build11
-rw-r--r--src/mixer/mixer.c1
2 files changed, 6 insertions, 6 deletions
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"