diff options
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/xlib.c | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/SConscript | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/SConscript | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/glapi_dispatch.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/SConscript | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/SConscript | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 2 |
8 files changed, 8 insertions, 5 deletions
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index b49b4e6fe2a..5764d4ff62f 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -11,6 +11,7 @@ env.Append(CPPPATH = [ '#/src/mesa/main', '#src/gallium/state_trackers/glx/xlib', Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers + Dir('../../../mapi/glapi/gen'), # src/mapi build path for python-generated GL API files/headers ]) env.Append(CPPDEFINES = ['USE_XSHM']) diff --git a/src/gallium/targets/libgl-xlib/xlib.c b/src/gallium/targets/libgl-xlib/xlib.c index 1b62afb29b5..85ddda9ed33 100644 --- a/src/gallium/targets/libgl-xlib/xlib.c +++ b/src/gallium/targets/libgl-xlib/xlib.c @@ -132,6 +132,6 @@ extern void (*linker_foo(const unsigned char *procName))() /* skip normal ones */ #define _GLAPI_SKIP_NORMAL_ENTRY_POINTS -#include "glapi/glapitemp.h" +#include "glapitemp.h" #endif /* GLX_INDIRECT_RENDERING */ diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index 118da1d53f7..a086f435efc 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -27,7 +27,7 @@ env.Append(CPPPATH = [ '#/src/mapi', '#/src/mesa', Dir('.'), # src/mapi/glapi build path - Dir('..'), # src/mapi build path + Dir('gen'), # src/mapi/glapi/gen build path ]) glapi_sources = [ diff --git a/src/mapi/glapi/gen/SConscript b/src/mapi/glapi/gen/SConscript index ff0df745c2c..942b5594231 100644 --- a/src/mapi/glapi/gen/SConscript +++ b/src/mapi/glapi/gen/SConscript @@ -28,7 +28,7 @@ env.CodeGenerate( ) env.CodeGenerate( - target = '../../../mapi/glapi/glapitemp.h', + target = '../../../mapi/glapi/gen/glapitemp.h', script = 'gl_apitemp.py', source = sources, command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c index ca15449ed01..96fd0d6a285 100644 --- a/src/mapi/glapi/glapi_dispatch.c +++ b/src/mapi/glapi/glapi_dispatch.c @@ -175,6 +175,6 @@ GL_API void GL_APIENTRY glPrimitiveBoundingBox (GLfloat minX, GLfloat minY, GLfl # endif #endif -#include "glapi/glapitemp.h" +#include "glapitemp.h" #endif /* USE_X86_ASM */ diff --git a/src/mesa/drivers/osmesa/SConscript b/src/mesa/drivers/osmesa/SConscript index b08a79eb8a5..d7e8fe84da6 100644 --- a/src/mesa/drivers/osmesa/SConscript +++ b/src/mesa/drivers/osmesa/SConscript @@ -8,6 +8,7 @@ env.Prepend(CPPPATH = [ '#src/mesa', Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers Dir('../../../mapi/glapi'), # src/mapi/glapi build path + Dir('../../../mapi/glapi/gen'), # src/mapi/glapi build path ]) env.Prepend(LIBS = [ diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript index b097dcc5900..cd9eaa3ea89 100644 --- a/src/mesa/drivers/x11/SConscript +++ b/src/mesa/drivers/x11/SConscript @@ -8,6 +8,7 @@ env.Append(CPPPATH = [ '#/src/mesa', '#/src/mesa/main', Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers + Dir('../../../mapi/glapi/gen'), # src/mapi/glapi/gen build path for python-generated GL API files/headers ]) env.Append(CPPDEFINES = ['USE_XSHM']) diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 2ef675682e4..1ca8bb1c0ff 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -73,7 +73,7 @@ struct display_dispatch { /* skip normal ones */ #define _GLAPI_SKIP_NORMAL_ENTRY_POINTS -#include "glapi/glapitemp.h" +#include "glapitemp.h" #endif /* GLX_INDIRECT_RENDERING */ |