From a25e1aa0aab6bd278eefa7c0748b491c9c6ae62c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 18 Sep 2008 13:26:30 -0600 Subject: glx: remove #include "glheader.h" lines Was only used to get the PUBLIC/USED macros. Also, replace "GL_FALSE" with "False" in a couple places. --- src/glx/x11/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'src/glx/x11/Makefile') diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 5d9c61c983..8d4a23ff17 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -50,7 +50,6 @@ OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS) INCLUDES = -I. \ -I$(TOP)/include \ -I$(TOP)/include/GL/internal \ - -I$(TOP)/src/mesa/main \ -I$(TOP)/src/mesa/glapi \ $(LIBDRM_CFLAGS) \ $(DRI2PROTO_CFLAGS) \ -- cgit v1.2.3 From 8d41e4536dfde34b55228cab6ddb081ad6252184 Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Thu, 18 Sep 2008 16:48:11 -0600 Subject: mesa: fix asst path/include mistakes in prev commits --- src/glx/x11/Makefile | 2 +- src/mesa/drivers/dri/swrast/swrast.c | 2 +- src/mesa/glapi/gl_x86_asm.py | 2 +- src/mesa/swrast/s_spantemp.h | 2 +- src/mesa/x86/glapi_x86.S | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/glx/x11/Makefile') diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 8d4a23ff17..2bcf94e506 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 cafba582d1..8ac44c46d4 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 403e87261b..651cb03f14 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 1eef81eb91..bab2ca7378 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 9a5d875e21..b99c2b6520 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) -- cgit v1.2.3 From 19d9c81b8c785e94b95110a45497aa52f4a53a34 Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 18 Sep 2008 21:22:08 -0600 Subject: glx: re-add glapi/ path --- src/glx/x11/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/glx/x11/Makefile') diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile index 2bcf94e506..419cb2853b 100644 --- a/src/glx/x11/Makefile +++ b/src/glx/x11/Makefile @@ -51,6 +51,7 @@ INCLUDES = -I. \ -I$(TOP)/include \ -I$(TOP)/include/GL/internal \ -I$(TOP)/src/mesa \ + -I$(TOP)/src/mesa/glapi \ $(LIBDRM_CFLAGS) \ $(DRI2PROTO_CFLAGS) \ $(X11_INCLUDES) -- cgit v1.2.3