diff options
author | Thibault Saunier <tsaunier@gnome.org> | 2016-08-24 09:41:08 -0300 |
---|---|---|
committer | Thibault Saunier <tsaunier@gnome.org> | 2016-08-25 15:17:17 -0300 |
commit | 50473d77cc3e4c0e333978cede3bec10d9de1c3a (patch) | |
tree | f18df65870b47426445f00ba93a669c12d89d2af /gst-libs | |
parent | 59b3e5944e5e573cf4e3e5607a7019f54f8d5eb6 (diff) | |
download | gstreamer-plugins-bad-50473d77cc3e4c0e333978cede3bec10d9de1c3a.tar.gz |
meson: Make mpegts lib build when using subprojects
The headers passed as parametter are relative to the build dir
basically "../subproject/gst-plugins-bad/gst-libs/gst/mpegts/XXX.h"
but that does not match what is needed at build time when building as
subproject, also we always add current dir as include_dir so we are
safe including directly.
And link mpegtsdemux against the 'math' library as it is needed.
Diffstat (limited to 'gst-libs')
-rwxr-xr-x | gst-libs/gst/mpegts/mpegts_enum.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst-libs/gst/mpegts/mpegts_enum.py b/gst-libs/gst/mpegts/mpegts_enum.py index 05efedbc4..c0c234a86 100755 --- a/gst-libs/gst/mpegts/mpegts_enum.py +++ b/gst-libs/gst/mpegts/mpegts_enum.py @@ -5,7 +5,7 @@ # make special characters such as \n go through all # backends is a fool's errand. -import sys, os, shutil, subprocess +import sys, os, subprocess cmd = [] argn = 1 @@ -20,7 +20,7 @@ for arg in sys.argv[1:]: ofilename = sys.argv[argn] headers = sys.argv[argn + 1:] -inc = '\n'.join(['#include"%s"' % i for i in headers]) +inc = '\n'.join(['#include"%s"' % os.path.basename(i) for i in headers]) h_array = ['--fhead', "#ifndef __GST_MPEGTS_ENUM_TYPES_H__\n#define __GST_MPEGTS_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n", |