Mesa (master): gallium/glx/xlib: main/ prefix on Mesa includes, remove -I$( TOP)/src/mesa/main/
Brian Paul
brianp at kemper.freedesktop.org
Wed Aug 12 16:33:06 UTC 2009
Module: Mesa
Branch: master
Commit: f21b0e9a048150569ad469ab021a62fdc986e0ae
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f21b0e9a048150569ad469ab021a62fdc986e0ae
Author: Brian Paul <brianp at vmware.com>
Date: Wed Aug 12 10:30:40 2009 -0600
gallium/glx/xlib: main/ prefix on Mesa includes, remove -I$(TOP)/src/mesa/main/
---
src/gallium/state_trackers/glx/xlib/Makefile | 3 +--
src/gallium/state_trackers/glx/xlib/glx_api.c | 10 +++++-----
src/gallium/state_trackers/glx/xlib/glx_usefont.c | 4 ++--
src/gallium/state_trackers/glx/xlib/xm_api.h | 2 +-
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/gallium/state_trackers/glx/xlib/Makefile b/src/gallium/state_trackers/glx/xlib/Makefile
index 44e504f..7b2adc6 100644
--- a/src/gallium/state_trackers/glx/xlib/Makefile
+++ b/src/gallium/state_trackers/glx/xlib/Makefile
@@ -5,8 +5,7 @@ LIBNAME = xlib
LIBRARY_INCLUDES = \
-I$(TOP)/include \
- -I$(TOP)/src/mesa \
- -I$(TOP)/src/mesa/main
+ -I$(TOP)/src/mesa
C_SOURCES = \
glx_api.c \
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index ce3267c..ffaceda 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -34,11 +34,11 @@
#include "GL/glx.h"
#include "xm_api.h"
-#include "context.h"
-#include "config.h"
-#include "macros.h"
-#include "imports.h"
-#include "version.h"
+#include "main/context.h"
+#include "main/config.h"
+#include "main/macros.h"
+#include "main/imports.h"
+#include "main/version.h"
#include "state_tracker/st_context.h"
#include "state_tracker/st_public.h"
diff --git a/src/gallium/state_trackers/glx/xlib/glx_usefont.c b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
index 62f3735..acc64df 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_usefont.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
@@ -30,8 +30,8 @@
*/
-#include "context.h"
-#include "imports.h"
+#include "main/context.h"
+#include "main/imports.h"
#include <GL/glx.h>
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.h b/src/gallium/state_trackers/glx/xlib/xm_api.h
index bdd434c..ce97a3e 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.h
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.h
@@ -57,7 +57,7 @@ and create a window, you must do the following to use the X/Mesa interface:
#define XMESA_H
-#include "mtypes.h"
+#include "main/mtypes.h"
#include "state_tracker/st_context.h"
#include "state_tracker/st_public.h"
#include "pipe/p_thread.h"
More information about the mesa-commit
mailing list