Mesa (master): meson: fix build for egl platform_x11 without dri3 and gbm

[GitLab Mirror]

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

Author: Alexander Tsoy <alexander at tsoy.me>
Date:   Wed Aug 15 23:54:46 2018 +0300

meson: fix build for egl platform_x11 without dri3 and gbm

Compiling EGL's platform_x11 without dri3 and gbm yields this compile
failure:

platform_x11 needs inc_loader:

../mesa-18.2.0-rc2/src/egl/drivers/dri2/platform_x11.c:48:10: fatal
error: loader.h: No such file or directory
 #include "loader.h"
          ^~~~~~~~~~

Fixes: 108d257a1685 ("meson: build libEGL")
Bugzilla: https://bugs.gentoo.org/663534
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/egl/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/egl/meson.build b/src/egl/meson.build
index 1d63f0f087..c7c22d3637 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -99,10 +99,10 @@ endif
 
 if with_platform_x11
   files_egl += files('drivers/dri2/platform_x11.c')
+  incs_for_egl += inc_loader
   if with_dri3
     files_egl += files('drivers/dri2/platform_x11_dri3.c')
     link_for_egl += libloader_dri3_helper
-    incs_for_egl += inc_loader
   endif
   deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes]
 endif