This is just a terrible idea, but it also needs to be fixed for the next patch to work, so let's fix it right.
Signed-off-by: Dylan Baker <[email protected]> --- src/gbm/Makefile.am | 4 +++- src/gbm/backends/dri/gbm_dri.c | 2 +- src/gbm/meson.build | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am index 805208a3ca9..05d861ff999 100644 --- a/src/gbm/Makefile.am +++ b/src/gbm/Makefile.am @@ -31,7 +31,9 @@ libgbm_la_LIBADD = \ $(DLOPEN_LIBS) if HAVE_PLATFORM_WAYLAND -AM_CFLAGS += $(WAYLAND_SERVER_CFLAGS) +AM_CFLAGS += \ + $(WAYLAND_SERVER_CFLAGS) \ + -I$(top_srcdir)/src/egl/wayland/wayland-drm/ libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_SERVER_LIBS) endif diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 0a4853bf63d..b2121cbc340 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -53,7 +53,7 @@ /* For importing wl_buffer */ #if HAVE_WAYLAND_PLATFORM -#include "../../../egl/wayland/wayland-drm/wayland-drm.h" +#include "wayland-drm.h" #endif #ifndef DRM_FORMAT_MOD_INVALID diff --git a/src/gbm/meson.build b/src/gbm/meson.build index 1bb3c94c387..2910fa2390c 100644 --- a/src/gbm/meson.build +++ b/src/gbm/meson.build @@ -31,6 +31,7 @@ deps_gbm = [] args_gbm = [] links_gbm = [] deps_gbm = [] +incs_gbm = [include_directories('main'), inc_include, inc_src, inc_loader] if with_dri2 files_gbm += files('backends/dri/gbm_dri.c', 'backends/dri/gbm_driint.h') @@ -40,6 +41,7 @@ endif if with_platform_wayland deps_gbm += dep_wayland_server links_gbm += libwayland_drm + incs_gbm += include_directories('../egl/wayland/wayland-drm') endif # TODO: wayland support (requires egl) @@ -47,9 +49,7 @@ endif libgbm = shared_library( 'gbm', files_gbm, - include_directories : [ - include_directories('main'), inc_include, inc_src, inc_loader, - include_directories('../egl/wayland/wayland-drm')], + include_directories : incs_gbm, c_args : args_gbm, link_args : [ld_args_gc_sections], link_with : [links_gbm, libloader, libmesa_util, libxmlconfig], -- 2.14.2 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
