summaryrefslogtreecommitdiff
path: root/src/glx
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-04-26 12:56:44 +0800
committerChia-I Wu <olv@lunarg.com>2010-05-07 10:41:11 +0800
commit296adbd545b8efd38c9ed508166b2de2764a444b (patch)
treeb146a292769007902a0aca98cfdd9d8ce7c44b59 /src/glx
parent73ded0624de66bc83ae990530febb129d950d04b (diff)
glapi: Move to src/mapi/.
Move glapi to src/mapi/{glapi,es1api,es2api}.
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/glx/Makefile b/src/glx/Makefile
index c6ebc49828..48d901fb89 100644
--- a/src/glx/Makefile
+++ b/src/glx/Makefile
@@ -39,7 +39,7 @@ SOURCES = \
dri2_glx.c \
dri2.c
-GLAPI_LIB = $(TOP)/src/mesa/libglapi.a
+GLAPI_LIB = $(TOP)/src/mapi/glapi/libglapi.a
OBJECTS = $(SOURCES:.c=.o)
@@ -47,7 +47,8 @@ INCLUDES = -I. \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa \
- -I$(TOP)/src/mesa/glapi \
+ -I$(TOP)/src/mapi \
+ -I$(TOP)/src/mapi/glapi \
$(LIBDRM_CFLAGS) \
$(DRI2PROTO_CFLAGS) \
$(X11_INCLUDES)
@@ -73,7 +74,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
$(GL_LIB_DEPS) $(OBJECTS) $(GLAPI_LIB)
$(GLAPI_LIB):
- @$(MAKE) -C $(TOP)/src/mesa libglapi.a
+ @$(MAKE) -C $(TOP)/src/mapi/glapi
depend: $(SOURCES) Makefile
rm -f depend