X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmeson.build;h=6d04b5fc3b2ae7a6f940fed27c82607cdefe4aae;hb=2e4525883f0744b0c8df9792ded597090a8ad987;hp=2c0bff734320d40efe861f300a4f5903d0edb1da;hpb=3832db275efdb235b3b7b27c9b41e64d5507aa2c;p=mesa.git

diff --git a/src/meson.build b/src/meson.build
index 2c0bff73432..6d04b5fc3b2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_common = include_directories(
-  '../include', '.', 'mapi', 'mesa', 'gallium/include', 'gallium/auxiliary')
+inc_common = [inc_include, include_directories(
+  '.', 'mapi', 'mesa', 'gallium/include', 'gallium/auxiliary')]
 inc_mesa = include_directories('mesa')
 inc_mapi = include_directories('mapi')
 inc_src = include_directories('.')
@@ -51,7 +51,10 @@ subdir('util')
 subdir('mapi')
 # TODO: opengl
 subdir('compiler')
-subdir('egl/wayland/wayland-drm')
+subdir('imgui')
+if with_platform_wayland
+  subdir('egl/wayland/wayland-drm')
+endif
 if with_any_vk
   subdir('vulkan')
 endif
@@ -61,7 +64,10 @@ endif
 if with_gallium_vc4 or with_gallium_v3d
   subdir('broadcom')
 endif
-if with_dri_i965 or with_intel_vk
+if with_gallium_freedreno or with_freedreno_vk
+  subdir('freedreno')
+endif
+if with_dri_i965 or with_intel_vk or with_gallium_iris
   subdir('intel')
 endif
 subdir('mesa')
@@ -69,7 +75,7 @@ subdir('loader')
 if with_platform_haiku
   subdir('hgl')
 endif
-if with_glx != 'disabled'
+if with_glx == 'dri'
   subdir('glx')
 endif
 if with_gbm