diff options
author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-01-30 11:54:24 +0000 |
---|---|---|
committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-01-30 11:54:24 +0000 |
commit | f0469c99d2c05497991650ebf402095b1711e5f4 (patch) | |
tree | 9173a85f489ee0db1103f1a5394b04ed13ce295e /omx/meson.build | |
parent | 8bd2b1f5504dfcbddb1923ddf29de11f7b476ed4 (diff) | |
download | gst-omx-f0469c99d2c05497991650ebf402095b1711e5f4.tar.gz |
Revert "meson: use include_directories() with external OMX headers path"
This reverts commit 9d37a92a615e54e8ee12f8c65bcfe386ec9de2d0.
Diffstat (limited to 'omx/meson.build')
-rw-r--r-- | omx/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/omx/meson.build b/omx/meson.build index b68cc55..ca0dccd 100644 --- a/omx/meson.build +++ b/omx/meson.build @@ -26,6 +26,7 @@ omx_sources = [ 'gstomxmp3enc.c', ] +extra_inc = [] extra_c_args = [] if have_omx_vp8 @@ -42,6 +43,10 @@ if have_omx_hevc omx_sources += 'gstomxh265dec.c' endif +if not have_external_omx + extra_inc += include_directories ('openmax') +endif + optional_deps = [] if gstgl_dep.found() optional_deps += gstgl_dep @@ -52,7 +57,7 @@ gstomx = library('gstomx', omx_sources, c_args : gst_omx_args + extra_c_args, # link_args : noseh_link_args, - include_directories : [configinc, omx_inc], + include_directories : [configinc] + extra_inc, dependencies : [gstvideo_dep, gstaudio_dep, gstbase_dep, gstcontroller_dep, libm, gmodule_dep, gstallocators_dep] + optional_deps, install : true, |