mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio: Merge simd libs into the main one

Browse source 
Actually extract the .o objects from the convience libraries and put
them into the main one. Without this, they will just be referenced by
the .pc file, but it will be unusable because they are not installed.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1122>
This commit is contained in:
Olivier Crête 2020-04-15 23:41:52 -04:00 committed by GStreamer Marge Bot
parent 89540bd528
commit 4d3a200358
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-plugins-base/gst-libs/gst/audio/meson.build
View file

@ -97,7 +97,7 @@ else
endif endif
simd_cargs = [] simd_cargs = []
simd_dependencies = [] simd_objects = []
if have_sse if have_sse
audio_resampler_sse = static_library('audio_resampler_sse', audio_resampler_sse = static_library('audio_resampler_sse',
@ -109,7 +109,7 @@ if have_sse
install : false install : false
) )
simd_cargs += ['-DHAVE_SSE'] simd_cargs += ['-DHAVE_SSE']
simd_dependencies += audio_resampler_sse simd_objects += audio_resampler_sse.extract_all_objects()
endif endif
if have_sse2 if have_sse2
@ -123,7 +123,7 @@ if have_sse2
) )
simd_cargs += ['-DHAVE_SSE2'] simd_cargs += ['-DHAVE_SSE2']
simd_dependencies += audio_resampler_sse2 simd_objects += audio_resampler_sse2.extract_all_objects()
endif endif
if have_sse41 if have_sse41
@ -137,14 +137,14 @@ if have_sse41
) )
simd_cargs += ['-DHAVE_SSE41'] simd_cargs += ['-DHAVE_SSE41']
simd_dependencies += audio_resampler_sse41 simd_objects += audio_resampler_sse41.extract_all_objects()
endif endif
gstaudio = library('gstaudio-@0@'.format(api_version), gstaudio = library('gstaudio-@0@'.format(api_version),
audio_src, gstaudio_h, gstaudio_c, orc_c, orc_h, audio_src, gstaudio_h, gstaudio_c, orc_c, orc_h,
c_args : gst_plugins_base_args + simd_cargs + ['-DBUILDING_GST_AUDIO'], c_args : gst_plugins_base_args + simd_cargs + ['-DBUILDING_GST_AUDIO'],
include_directories: [configinc, libsinc], include_directories: [configinc, libsinc],
link_with : simd_dependencies, objects : simd_objects,
version : libversion, version : libversion,
soversion : soversion, soversion : soversion,
darwin_versions : osxversion, darwin_versions : osxversion,