mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "meson: Use the new pic argument on static libs"

Browse source 
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:
Thibault Saunier 2016-10-20 17:17:54 -03:00
parent e3c22605ae
commit 9842a6708d
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst-libs/gst/audio/meson.build
View file

@ -91,11 +91,10 @@ 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], c_args : gst_plugins_base_args + [sse_args] + [pic_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']
@ -105,11 +104,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], c_args : gst_plugins_base_args + [sse2_args] + [pic_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']
@ -119,11 +117,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], c_args : gst_plugins_base_args + [sse41_args] + [pic_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']

8
meson.build
View file

@ -185,6 +185,14 @@ 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')