summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-01-11 18:32:14 -0500
committerMatt Turner <[email protected]>2012-01-20 14:56:42 -0500
commitadefee50d954151f76150af80207081ae3c247d9 (patch)
treec70cf0abe077c38d76a22eef437673a6692dd2bf /src/mesa
parent2fdbbeca43e7b57095774e4228e6eea75a180fab (diff)
Always build shared glapi
libglapi.so, libGL.so, libGLESv2.so, libGLESv1_CM.so must all come from the same version of Mesa or bad things may happen. Acked-by: Kenneth Graunke <[email protected]> Signed-off-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/x11/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile
index 412fbfe1aee..acb6f082956 100644
--- a/src/mesa/drivers/x11/Makefile
+++ b/src/mesa/drivers/x11/Makefile
@@ -44,9 +44,7 @@ INCLUDE_DIRS = \
CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mapi/glapi/libglapi.a
-ifeq ($(SHARED_GLAPI),1)
GL_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(GL_LIB_DEPS)
-endif
.c.o: