mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 06:46:38 +00:00
meson: require meson 0.36 and use new pic
arg on static libs
Removes a meson warning and some special casing we had.
This commit is contained in:
parent
5a72c23a54
commit
ae608845ca
3 changed files with 5 additions and 11 deletions
|
@ -74,6 +74,7 @@ endif
|
|||
printf_lib = static_library('gstprintf',
|
||||
printf_sources,
|
||||
include_directories : [configinc],
|
||||
c_args : printf_args + pic_args,
|
||||
c_args : printf_args,
|
||||
install : false,
|
||||
pic: true,
|
||||
dependencies : [glib_dep])
|
||||
|
|
|
@ -38,4 +38,5 @@ libcheck = static_library('check',
|
|||
libcheck_files,
|
||||
include_directories : [ configinc, internal_check_h_inc ],
|
||||
dependencies : [rt_lib, mathlib],
|
||||
c_args: gst_c_args + pic_args)
|
||||
c_args: gst_c_args,
|
||||
pic: true)
|
||||
|
|
10
meson.build
10
meson.build
|
@ -1,6 +1,6 @@
|
|||
project('gstreamer', 'c', 'cpp',
|
||||
version : '1.11.0.1',
|
||||
meson_version : '>= 0.35.0',
|
||||
meson_version : '>= 0.36.0',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
||||
|
@ -29,14 +29,6 @@ helpers_install_dir = libexecdir + '/gstreamer-1.0/'
|
|||
|
||||
cc = meson.get_compiler('c')
|
||||
|
||||
# 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
|
||||
|
||||
# Ignore several spurious warnings for things gstreamer does very commonly
|
||||
# If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
|
||||
# If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once
|
||||
|
|
Loading…
Reference in a new issue