summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan Baker <[email protected]>2017-11-02 14:30:53 -0700
committerDylan Baker <[email protected]>2017-11-10 13:00:01 -0800
commitdc0ec581f22307bf80db4f90625c874ccc0f37b6 (patch)
tree6d5aa8e9537b25371dde524e47782ad04fc1ceba
parent140b688c57f592c2a44fb86ee199b813a7f76b21 (diff)
meson: move wayland-egl into egl folder
This ensure that it's properly guarded, but also makes the code clearer by grouping related things together. Signed-off-by: Dylan Baker <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
-rw-r--r--src/egl/meson.build4
-rw-r--r--src/meson.build3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/egl/meson.build b/src/egl/meson.build
index 36b1d9e41b0..f32715265ce 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -182,6 +182,10 @@ pkg.generate(
extra_cflags : gl_pkgconfig_c_flags,
)
+if with_platform_wayland
+ subdir('wayland/wayland-egl')
+endif
+
if with_tests
if with_glvnd
# TODO: add glvnd symbol check
diff --git a/src/meson.build b/src/meson.build
index cc8f5953c51..186cf92f47e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -59,9 +59,6 @@ subdir('intel')
subdir('mesa')
subdir('loader')
subdir('glx')
-if with_platform_wayland
- subdir('egl/wayland/wayland-egl')
-endif
if with_gbm
subdir('gbm')
endif