Module: Mesa
Branch: master
Commit: dc0ec581f22307bf80db4f90625c874ccc0f37b6
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc0ec581f22307bf80db4f90625c874ccc0f37b6

Author: Dylan Baker <[email protected]>
Date:   Thu Nov  2 14:30:53 2017 -0700

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]>

---

 src/egl/meson.build | 4 ++++
 src/meson.build     | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/egl/meson.build b/src/egl/meson.build
index 36b1d9e41b..f32715265c 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 cc8f5953c5..186cf92f47 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

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to