summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsap7@yahoo.gr>2007-04-05 18:59:42 +0300
committerGeorge Sapountzis <gsap7@yahoo.gr>2007-04-05 18:59:42 +0300
commit885111518eeb60664b2ac708512dc8b599060280 (patch)
treee79433ad2e222c64235cacdbc8fb6e92b75d3502 /src
parent0cae814f362bd7e648535c8ceae12ad286d20d73 (diff)
Move glcontextmodes.c to glx.
It is no longer linked with DRI drivers, libGL passes function pointers through the DRI interface.
Diffstat (limited to 'src')
-rw-r--r--src/glx/mini/Makefile7
-rw-r--r--src/glx/x11/Makefile4
-rw-r--r--src/glx/x11/glcontextmodes.c (renamed from src/mesa/drivers/dri/common/glcontextmodes.c)0
-rw-r--r--src/glx/x11/glcontextmodes.h (renamed from src/mesa/drivers/dri/common/glcontextmodes.h)0
4 files changed, 2 insertions, 9 deletions
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 217b8a76ec..72943105c2 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -11,7 +11,7 @@ C_SOURCES = \
$(TOP)/src/mesa/main/dispatch.c \
$(TOP)/src/mesa/glapi/glapi.c \
$(TOP)/src/mesa/glapi/glthread.c \
- $(TOP)/src/mesa/drivers/dri/common/glcontextmodes.c \
+ $(TOP)/src/glx/x11/glcontextmodes.c \
miniglx.c \
miniglx_events.c
@@ -27,10 +27,7 @@ INCLUDE_DIRS = \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
- -I$(TOP)/src/mesa/math \
- -I$(TOP)/src/mesa/transform \
- -I$(TOP)/src/mesa/swrast \
- -I$(TOP)/src/mesa/swrast_setup \
+ -I$(TOP)/src/glx/x11 \
-I$(TOP)/src/mesa/drivers/dri/common \
`pkg-config --cflags libdrm`
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index c509d4e085..fd83c6fc94 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -46,7 +46,6 @@ INCLUDES = -I. \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
- -I$(TOP)/src/mesa/drivers/dri/common \
$(LIBDRM_CFLAGS) \
$(X11_INCLUDES)
@@ -63,9 +62,6 @@ INCLUDES = -I. \
default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
-glcontextmodes.c:
- ln -s $(TOP)/src/mesa/drivers/dri/common/glcontextmodes.c .
-
# Make libGL
$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile
$(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
diff --git a/src/mesa/drivers/dri/common/glcontextmodes.c b/src/glx/x11/glcontextmodes.c
index edb04463f6..edb04463f6 100644
--- a/src/mesa/drivers/dri/common/glcontextmodes.c
+++ b/src/glx/x11/glcontextmodes.c
diff --git a/src/mesa/drivers/dri/common/glcontextmodes.h b/src/glx/x11/glcontextmodes.h
index 4b5c6f68b8..4b5c6f68b8 100644
--- a/src/mesa/drivers/dri/common/glcontextmodes.h
+++ b/src/glx/x11/glcontextmodes.h