From eb072600a6e9aef1898520f90b640e2e15b61c07 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 19 Oct 2021 10:07:55 -0400 Subject: [PATCH] Revert "audio: Merge simd libs into the main one" This reverts commit 4d3a200358439e6c76c5dd1be2daae0cceb0e44a. Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build index 8c2a6b4..be1a324 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build @@ -97,7 +97,7 @@ else endif simd_cargs = [] -simd_objects = [] +simd_dependencies = [] if have_sse audio_resampler_sse = static_library('audio_resampler_sse', @@ -109,7 +109,7 @@ if have_sse install : false ) simd_cargs += ['-DHAVE_SSE'] - simd_objects += audio_resampler_sse.extract_all_objects() + simd_dependencies += audio_resampler_sse endif if have_sse2 @@ -123,7 +123,7 @@ if have_sse2 ) simd_cargs += ['-DHAVE_SSE2'] - simd_objects += audio_resampler_sse2.extract_all_objects() + simd_dependencies += audio_resampler_sse2 endif if have_sse41 @@ -137,14 +137,14 @@ if have_sse41 ) simd_cargs += ['-DHAVE_SSE41'] - simd_objects += audio_resampler_sse41.extract_all_objects() + simd_dependencies += audio_resampler_sse41 endif gstaudio = library('gstaudio-@0@'.format(api_version), audio_src, gstaudio_h, gstaudio_c, orc_c, orc_h, c_args : gst_plugins_base_args + simd_cargs + ['-DBUILDING_GST_AUDIO', '-DG_LOG_DOMAIN="GStreamer-Audio"'], include_directories: [configinc, libsinc], - objects : simd_objects, + link_with : simd_dependencies, version : libversion, soversion : soversion, darwin_versions : osxversion, -- 2.7.4