[Mesa-dev] [PATCH 5/9] osmesa: Include generated headers without path
Dylan Baker
dylan at pnwbakers.com
Wed Oct 25 22:58:19 UTC 2017
This makes things much easier to ensure correctness with meson. Tested
with make dist-check and with meson.
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
src/mesa/drivers/osmesa/Makefile.am | 2 ++
src/mesa/drivers/osmesa/osmesa.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index 2c8d4668b1b..3c7def5c5c9 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -30,6 +30,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mapi \
+ -I$(top_builddir)/src/mapi/glapi \
+ -I$(top_srcdir)/src/mapi/glapi \
-I$(top_srcdir)/src/mesa/ \
$(DEFINES)
AM_CFLAGS = $(PTHREAD_CFLAGS) \
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 734a4e891cb..72bff3da2c6 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1291,7 +1291,7 @@ OSMesaPostprocess(OSMesaContext osmesa, const char *filter,
#define GL_GLEXT_PROTOTYPES
#include "GL/gl.h"
#include "glapi/glapi.h"
-#include "glapi/glapitable.h"
+#include "glapitable.h"
#if defined(USE_MGL_NAMESPACE)
#define NAME(func) mgl##func
@@ -1307,6 +1307,6 @@ OSMesaPostprocess(OSMesaContext osmesa, const char *filter,
/* skip normal ones */
#define _GLAPI_SKIP_NORMAL_ENTRY_POINTS
-#include "glapi/glapitemp.h"
+#include "glapitemp.h"
#endif /* GLX_INDIRECT_RENDERING */
--
2.14.2
More information about the mesa-dev
mailing list