Module: Mesa Branch: master Commit: 2b1b2cbf619f9b3d578dabb0956bd5a248b6a89c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b1b2cbf619f9b3d578dabb0956bd5a248b6a89c
Author: Eric Anholt <[email protected]> Date: Tue Jun 5 08:50:55 2018 -0700 v3d: Be more explicit about include directory from our generated code. You'd need src/broadcom/cle/ in the -I previously, for srcdir != builddir. nir was fine at that, but automake didn't have it. Bugzilla: https://github.com/anholt/mesa/issues/104 --- src/broadcom/cle/gen_pack_header.py | 2 +- src/gallium/drivers/v3d/Makefile.am | 2 ++ src/gallium/drivers/vc4/Makefile.am | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/broadcom/cle/gen_pack_header.py b/src/broadcom/cle/gen_pack_header.py index e5762762b2..310e0a7c7a 100644 --- a/src/broadcom/cle/gen_pack_header.py +++ b/src/broadcom/cle/gen_pack_header.py @@ -43,7 +43,7 @@ pack_header = """%(license)s #ifndef %(guard)s #define %(guard)s -#include "v3d_packet_helpers.h" +#include "cle/v3d_packet_helpers.h" """ diff --git a/src/gallium/drivers/v3d/Makefile.am b/src/gallium/drivers/v3d/Makefile.am index ff0334a239..5b4ed5df2b 100644 --- a/src/gallium/drivers/v3d/Makefile.am +++ b/src/gallium/drivers/v3d/Makefile.am @@ -25,7 +25,9 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_builddir)/src/compiler/nir \ -I$(top_srcdir)/include/drm-uapi \ + -I$(top_srcdir)/src/broadcom \ -I$(top_builddir)/src/broadcom \ + -I$(top_builddir)/src \ $(LIBDRM_CFLAGS) \ $(V3D_SIMULATOR_CFLAGS) \ $(GALLIUM_DRIVER_CFLAGS) \ diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am index d65bf20e26..4c7dd843da 100644 --- a/src/gallium/drivers/vc4/Makefile.am +++ b/src/gallium/drivers/vc4/Makefile.am @@ -30,7 +30,8 @@ AM_CFLAGS = \ -I$(top_builddir)/src/compiler/nir \ -I$(top_srcdir)/include/drm-uapi \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src/broadcom/cle \ + -I$(top_srcdir)/src/broadcom \ + -I$(top_builddir)/src/broadcom \ $(LIBDRM_CFLAGS) \ $(GALLIUM_DRIVER_CFLAGS) \ $(SIM_CFLAGS) \ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
