summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2018-03-06 10:36:42 -0800
committerDylan Baker <[email protected]>2018-03-07 13:30:53 -0800
commit6f628951afa342c1da5b770ab1cc73b50fab1a10 (patch)
tree910c633f2bcc468f92efa20301dec82c64a43ad3 /src/gallium
parent34e852d5b50772199797ea839fc8d6b3805633ff (diff)
meson: Use include directory variables instead of traversing
Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Jon Turney <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Tested-by: Julien Isorce <[email protected]> Tested-by: Karol Herbst <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/state_trackers/dri/meson.build2
-rw-r--r--src/gallium/state_trackers/omx/meson.build12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/state_trackers/dri/meson.build
index b99314ebf61..dfc37fcd81c 100644
--- a/src/gallium/state_trackers/dri/meson.build
+++ b/src/gallium/state_trackers/dri/meson.build
@@ -18,6 +18,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
+inc_st_dri = include_directories('.')
+
files_libdri = files(
'dri_context.c',
'dri_context.h',
diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build
index b0c71a895ff..dd803f679fa 100644
--- a/src/gallium/state_trackers/omx/meson.build
+++ b/src/gallium/state_trackers/omx/meson.build
@@ -51,13 +51,11 @@ files_omx += files(
inc_st_omx = [
inc_st_omx,
inc_dri_common,
- include_directories('../../state_trackers/dri'),
- include_directories('../../../egl/drivers/dri2'),
- include_directories('../../../egl/main'),
- include_directories('../../../egl'),
- include_directories('../../../gbm/backends/dri'),
- include_directories('../../../gbm/main'),
- include_directories('../../../loader')
+ inc_loader,
+ inc_gbm,
+ inc_st_dri,
+ inc_egl,
+ inc_egl_dri2,
]
dep_st_omx = [dep_st_omx, dep_omx_other, dep_libdrm]
endif