diff options
| author | Dylan Baker <[email protected]> | 2017-10-23 16:09:15 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-10-27 11:06:07 -0700 |
| commit | 5daed06da2c0aaa48a93439bfdb63818786bc278 (patch) | |
| tree | 5e6d6792cfd41177784fbb7722fde66fc034936f | |
| parent | 06c667556045bd9542ad5e6a318f42dd66707bd4 (diff) | |
osmesa: Include generated headers without path
This makes things much easier to ensure correctness with meson. Tested
with make dist-check and with meson.
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 */ |