Commit 914ad261 authored by Max Kellermann's avatar Max Kellermann

pcm/meson.build: split libpcm into two

One basic library without dependencies, and one with heavy dependencies like libsamplerate.
parent 75518672
...@@ -7,6 +7,7 @@ decoder_api = static_library( ...@@ -7,6 +7,7 @@ decoder_api = static_library(
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
log_dep, log_dep,
pcm_basic_dep,
], ],
) )
......
...@@ -44,6 +44,7 @@ encoder_plugins = static_library( ...@@ -44,6 +44,7 @@ encoder_plugins = static_library(
encoder_plugins_sources, encoder_plugins_sources,
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
pcm_basic_dep,
flac_dep, flac_dep,
ogg_dep, ogg_dep,
libopus_dep, libopus_dep,
......
pcm_sources = [ pcm_basic_sources = [
'../CheckAudioFormat.cxx', '../CheckAudioFormat.cxx',
'../AudioFormat.cxx', '../AudioFormat.cxx',
'../AudioParser.cxx', '../AudioParser.cxx',
...@@ -6,25 +6,17 @@ pcm_sources = [ ...@@ -6,25 +6,17 @@ pcm_sources = [
'Interleave.cxx', 'Interleave.cxx',
'Buffer.cxx', 'Buffer.cxx',
'Export.cxx', 'Export.cxx',
'Convert.cxx',
'Dop.cxx', 'Dop.cxx',
'Volume.cxx', 'Volume.cxx',
'Silence.cxx', 'Silence.cxx',
'Mix.cxx', 'Mix.cxx',
'PcmChannels.cxx',
'Pack.cxx', 'Pack.cxx',
'PcmFormat.cxx',
'FormatConverter.cxx',
'ChannelsConverter.cxx',
'Order.cxx', 'Order.cxx',
'GlueResampler.cxx',
'FallbackResampler.cxx',
'ConfiguredResampler.cxx',
'Dither.cxx', 'Dither.cxx',
] ]
if get_option('dsd') if get_option('dsd')
pcm_sources += [ pcm_basic_sources += [
'Dsd16.cxx', 'Dsd16.cxx',
'Dsd32.cxx', 'Dsd32.cxx',
'PcmDsd.cxx', 'PcmDsd.cxx',
...@@ -32,6 +24,30 @@ if get_option('dsd') ...@@ -32,6 +24,30 @@ if get_option('dsd')
] ]
endif endif
pcm_basic = static_library(
'pcm_basic',
pcm_basic_sources,
include_directories: inc,
dependencies: [
util_dep,
],
)
pcm_basic_dep = declare_dependency(
link_with: pcm_basic,
)
pcm_sources = [
'Convert.cxx',
'PcmChannels.cxx',
'PcmFormat.cxx',
'FormatConverter.cxx',
'ChannelsConverter.cxx',
'GlueResampler.cxx',
'FallbackResampler.cxx',
'ConfiguredResampler.cxx',
]
libsamplerate_dep = dependency('samplerate', version: '>= 0.1.3', required: get_option('libsamplerate')) libsamplerate_dep = dependency('samplerate', version: '>= 0.1.3', required: get_option('libsamplerate'))
if libsamplerate_dep.found() if libsamplerate_dep.found()
conf.set('ENABLE_LIBSAMPLERATE', true) conf.set('ENABLE_LIBSAMPLERATE', true)
...@@ -50,6 +66,7 @@ pcm = static_library( ...@@ -50,6 +66,7 @@ pcm = static_library(
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
util_dep, util_dep,
pcm_basic_dep,
libsamplerate_dep, libsamplerate_dep,
soxr_dep, soxr_dep,
], ],
......
...@@ -271,13 +271,11 @@ if enable_database ...@@ -271,13 +271,11 @@ if enable_database
'../src/db/Selection.cxx', '../src/db/Selection.cxx',
'../src/db/PlaylistVector.cxx', '../src/db/PlaylistVector.cxx',
'../src/db/DatabaseLock.cxx', '../src/db/DatabaseLock.cxx',
'../src/AudioFormat.cxx',
'../src/AudioParser.cxx',
'../src/pcm/SampleFormat.cxx',
'../src/SongSave.cxx', '../src/SongSave.cxx',
'../src/TagSave.cxx', '../src/TagSave.cxx',
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
pcm_basic_dep,
song_dep, song_dep,
fs_dep, fs_dep,
event_dep, event_dep,
...@@ -540,7 +538,6 @@ if encoder_glue_dep.found() ...@@ -540,7 +538,6 @@ if encoder_glue_dep.found()
executable( executable(
'run_encoder', 'run_encoder',
'run_encoder.cxx', 'run_encoder.cxx',
'../src/AudioParser.cxx',
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
encoder_glue_dep, encoder_glue_dep,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment