meson: fix build for egl platform_x11 without dri3 and gbm
authorAlexander Tsoy <alexander@tsoy.me>
Wed, 15 Aug 2018 20:54:46 +0000 (23:54 +0300)
committerMatt Turner <mattst88@gmail.com>
Wed, 15 Aug 2018 23:37:16 +0000 (16:37 -0700)
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@gmail.com>
src/egl/meson.build

index 1d63f0f087c6deee1a9a7a18baa55fce480a503d..c7c22d363714169b544e0d590c1f5a227f3a9318 100644 (file)
@@ -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