diff options
| author | Chris Rankin <[email protected]> | 2008-09-18 16:48:11 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-09-18 16:48:11 -0600 |
| commit | 8d41e4536dfde34b55228cab6ddb081ad6252184 (patch) | |
| tree | 813d3dd51511c1578571f1bbe30a0f028478310b /src | |
| parent | 58dce864e659da3d1f9761154e622a45e420c229 (diff) | |
mesa: fix asst path/include mistakes in prev commits
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/x11/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/swrast/swrast.c | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/gl_x86_asm.py | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_spantemp.h | 2 | ||||
| -rw-r--r-- | src/mesa/x86/glapi_x86.S | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 8d4a23ff174..2bcf94e5063 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -50,7 +50,7 @@ OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS) INCLUDES = -I. \ -I$(TOP)/include \ -I$(TOP)/include/GL/internal \ - -I$(TOP)/src/mesa/glapi \ + -I$(TOP)/src/mesa \ $(LIBDRM_CFLAGS) \ $(DRI2PROTO_CFLAGS) \ $(X11_INCLUDES) diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index cafba582d17..8ac44c46d42 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -39,7 +39,7 @@ #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" #include "tnl/tnl.h" -#include "tnl/tcontext.h" +#include "tnl/t_context.h" #include "tnl/t_pipeline.h" #include "vbo/vbo.h" #include "drivers/common/driverfuncs.h" diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py index 403e87261b0..651cb03f14d 100644 --- a/src/mesa/glapi/gl_x86_asm.py +++ b/src/mesa/glapi/gl_x86_asm.py @@ -51,7 +51,7 @@ class PrintGenericStubs(gl_XML.gl_print_base): def printRealHeader(self): print '#include "assyntax.h"' - print '#include "glapioffsets.h"' + print '#include "glapi/glapioffsets.h"' print '' print '#if defined(STDCALL_API)' print '# if defined(USE_MGL_NAMESPACE)' diff --git a/src/mesa/swrast/s_spantemp.h b/src/mesa/swrast/s_spantemp.h index 1eef81eb914..bab2ca7378f 100644 --- a/src/mesa/swrast/s_spantemp.h +++ b/src/mesa/swrast/s_spantemp.h @@ -43,7 +43,7 @@ * ignored otherwise. */ -#include "macros.h" +#include "main/macros.h" #ifdef CI_MODE diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S index 9a5d875e214..b99c2b65203 100644 --- a/src/mesa/x86/glapi_x86.S +++ b/src/mesa/x86/glapi_x86.S @@ -27,7 +27,7 @@ */ #include "assyntax.h" -#include "glapioffsets.h" +#include "glapi/glapioffsets.h" #if defined(STDCALL_API) # if defined(USE_MGL_NAMESPACE) |