mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-08 15:45:55 +00:00
meson: use built-in pic kwarg when building static helper libs
instead of passing -fPIC manually.
This commit is contained in:
parent
17b118c120
commit
c443e33a3a
|
@ -99,12 +99,12 @@ simd_dependencies = []
|
||||||
if have_sse
|
if have_sse
|
||||||
audio_resampler_sse = static_library('audio_resampler_sse',
|
audio_resampler_sse = static_library('audio_resampler_sse',
|
||||||
['audio-resampler-x86-sse.c', gstaudio_h],
|
['audio-resampler-x86-sse.c', gstaudio_h],
|
||||||
c_args : gst_plugins_base_args + [sse_args] + [pic_args],
|
c_args : gst_plugins_base_args + [sse_args],
|
||||||
include_directories : [configinc, libsinc],
|
include_directories : [configinc, libsinc],
|
||||||
dependencies : [gst_base_dep],
|
dependencies : [gst_base_dep],
|
||||||
|
pic : true,
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
|
|
||||||
simd_cargs += ['-DHAVE_SSE']
|
simd_cargs += ['-DHAVE_SSE']
|
||||||
simd_dependencies += audio_resampler_sse
|
simd_dependencies += audio_resampler_sse
|
||||||
endif
|
endif
|
||||||
|
@ -112,9 +112,10 @@ endif
|
||||||
if have_sse2
|
if have_sse2
|
||||||
audio_resampler_sse2 = static_library('audio_resampler_sse2',
|
audio_resampler_sse2 = static_library('audio_resampler_sse2',
|
||||||
['audio-resampler-x86-sse2.c', gstaudio_h],
|
['audio-resampler-x86-sse2.c', gstaudio_h],
|
||||||
c_args : gst_plugins_base_args + [sse2_args] + [pic_args],
|
c_args : gst_plugins_base_args + [sse2_args],
|
||||||
include_directories : [configinc, libsinc],
|
include_directories : [configinc, libsinc],
|
||||||
dependencies : [gst_base_dep],
|
dependencies : [gst_base_dep],
|
||||||
|
pic : true,
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -125,9 +126,10 @@ endif
|
||||||
if have_sse41
|
if have_sse41
|
||||||
audio_resampler_sse41 = static_library('audio_resampler_sse41',
|
audio_resampler_sse41 = static_library('audio_resampler_sse41',
|
||||||
['audio-resampler-x86-sse41.c', gstaudio_h],
|
['audio-resampler-x86-sse41.c', gstaudio_h],
|
||||||
c_args : gst_plugins_base_args + [sse41_args] + [pic_args],
|
c_args : gst_plugins_base_args + [sse41_args],
|
||||||
include_directories : [configinc, libsinc],
|
include_directories : [configinc, libsinc],
|
||||||
dependencies : [gst_base_dep],
|
dependencies : [gst_base_dep],
|
||||||
|
pic : true,
|
||||||
install : false
|
install : false
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -215,14 +215,6 @@ have_sse = cc.has_argument(sse_args)
|
||||||
have_sse2 = cc.has_argument(sse2_args)
|
have_sse2 = cc.has_argument(sse2_args)
|
||||||
have_sse41 = cc.has_argument(sse41_args)
|
have_sse41 = cc.has_argument(sse41_args)
|
||||||
|
|
||||||
# FIXME: Meson should have a way for portably adding -fPIC when needed for use
|
|
||||||
# with static libraries that are linked into shared libraries. Or, it should
|
|
||||||
# add it by default with an option to turn it off if needed.
|
|
||||||
pic_args = ['-fPIC']
|
|
||||||
if host_machine.system() == 'windows'
|
|
||||||
pic_args = []
|
|
||||||
endif
|
|
||||||
|
|
||||||
if gst_dep.type_name() == 'internal'
|
if gst_dep.type_name() == 'internal'
|
||||||
gst_proj = subproject('gstreamer')
|
gst_proj = subproject('gstreamer')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue