summaryrefslogtreecommitdiffstats
path: root/src/glx/Makefile
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2010-08-13 20:22:46 -0700
committerIan Romanick <[email protected]>2010-08-13 20:22:46 -0700
commit443a7e4e9a360acbc3e662c098be436f180bf81d (patch)
tree71125fc394bdcbc17cd7ed74c592b9a7761541f8 /src/glx/Makefile
parent2f8ee757ab324d599fcb8287789eb5f1a7890d74 (diff)
parent27041d7cb3faeaed483538a228573466363ec1c7 (diff)
Merge branch 'master' into glsl2
Diffstat (limited to 'src/glx/Makefile')
-rw-r--r--src/glx/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/glx/Makefile b/src/glx/Makefile
index 48d901fb894..9a22d0c547a 100644
--- a/src/glx/Makefile
+++ b/src/glx/Makefile
@@ -5,14 +5,15 @@ EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT \
-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\"
SOURCES = \
- glcontextmodes.c \
clientattrib.c \
compsize.c \
eval.c \
+ glxconfig.c \
glxcmds.c \
glxcurrent.c \
glxext.c \
glxextensions.c \
+ indirect_glx.c \
indirect.c \
indirect_init.c \
indirect_size.c \
@@ -37,7 +38,9 @@ SOURCES = \
XF86dri.c \
glxhash.c \
dri2_glx.c \
- dri2.c
+ dri2.c \
+ applegl_glx.c
+
GLAPI_LIB = $(TOP)/src/mapi/glapi/libglapi.a