mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-03 01:02:19 +00:00
meson: Use the new pic
argument on static libs
We depend on 0.35 already
This commit is contained in:
parent
7986a8ed3d
commit
e3c22605ae
2 changed files with 9 additions and 14 deletions
|
@ -91,10 +91,11 @@ 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],
|
||||||
install : false
|
install : false,
|
||||||
|
pic: true
|
||||||
)
|
)
|
||||||
|
|
||||||
simd_cargs += ['-DHAVE_SSE']
|
simd_cargs += ['-DHAVE_SSE']
|
||||||
|
@ -104,10 +105,11 @@ 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],
|
||||||
install : false
|
install : false,
|
||||||
|
pic: true
|
||||||
)
|
)
|
||||||
|
|
||||||
simd_cargs += ['-DHAVE_SSE2']
|
simd_cargs += ['-DHAVE_SSE2']
|
||||||
|
@ -117,10 +119,11 @@ 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],
|
||||||
install : false
|
install : false,
|
||||||
|
pic: true
|
||||||
)
|
)
|
||||||
|
|
||||||
simd_cargs += ['-DHAVE_SSE41']
|
simd_cargs += ['-DHAVE_SSE41']
|
||||||
|
|
|
@ -185,14 +185,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
|
|
||||||
|
|
||||||
subdir('gst-libs')
|
subdir('gst-libs')
|
||||||
subdir('gst')
|
subdir('gst')
|
||||||
subdir('ext')
|
subdir('ext')
|
||||||
|
|
Loading…
Reference in a new issue