mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
Revert "meson: Use the new pic
argument on static libs"
This reverts commit e3c22605ae
.
pic was added after 0.35 and will be present in 0.36 (meson documentation
was wrong).
This commit is contained in:
parent
e3c22605ae
commit
9842a6708d
2 changed files with 14 additions and 9 deletions
|
@ -91,11 +91,10 @@ simd_dependencies = []
|
|||
if have_sse
|
||||
audio_resampler_sse = static_library('audio_resampler_sse',
|
||||
['audio-resampler-x86-sse.c', gstaudio_h],
|
||||
c_args : gst_plugins_base_args + [sse_args],
|
||||
c_args : gst_plugins_base_args + [sse_args] + [pic_args],
|
||||
include_directories : [configinc, libsinc],
|
||||
dependencies : [gst_base_dep],
|
||||
install : false,
|
||||
pic: true
|
||||
install : false
|
||||
)
|
||||
|
||||
simd_cargs += ['-DHAVE_SSE']
|
||||
|
@ -105,11 +104,10 @@ endif
|
|||
if have_sse2
|
||||
audio_resampler_sse2 = static_library('audio_resampler_sse2',
|
||||
['audio-resampler-x86-sse2.c', gstaudio_h],
|
||||
c_args : gst_plugins_base_args + [sse2_args],
|
||||
c_args : gst_plugins_base_args + [sse2_args] + [pic_args],
|
||||
include_directories : [configinc, libsinc],
|
||||
dependencies : [gst_base_dep],
|
||||
install : false,
|
||||
pic: true
|
||||
install : false
|
||||
)
|
||||
|
||||
simd_cargs += ['-DHAVE_SSE2']
|
||||
|
@ -119,11 +117,10 @@ endif
|
|||
if have_sse41
|
||||
audio_resampler_sse41 = static_library('audio_resampler_sse41',
|
||||
['audio-resampler-x86-sse41.c', gstaudio_h],
|
||||
c_args : gst_plugins_base_args + [sse41_args],
|
||||
c_args : gst_plugins_base_args + [sse41_args] + [pic_args],
|
||||
include_directories : [configinc, libsinc],
|
||||
dependencies : [gst_base_dep],
|
||||
install : false,
|
||||
pic: true
|
||||
install : false
|
||||
)
|
||||
|
||||
simd_cargs += ['-DHAVE_SSE41']
|
||||
|
|
|
@ -185,6 +185,14 @@ have_sse = cc.has_argument(sse_args)
|
|||
have_sse2 = cc.has_argument(sse2_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
|
||||
|
||||
subdir('gst-libs')
|
||||
subdir('gst')
|
||||
subdir('ext')
|
||||
|
|
Loading…
Reference in a new issue