summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-06-19 17:28:25 +0100
committerEmil Velikov <[email protected]>2015-06-23 17:04:21 +0100
commitb92233f2a57ec09e9266ba4ed7f200904b784b9a (patch)
tree247fbb97f13fc2819cd21d2e041f946a90e608c5 /src/mesa/drivers/x11
parent6d744aaf4e427b6b0b3d8d35d756592a50abbb97 (diff)
drivers/x11: fix the build against shared_glapi
Cc: Brian Paul <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Acked-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/Makefile.am7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
index c0596f8119e..a8847e8a7ac 100644
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -25,6 +25,11 @@
EXTRA_DIST = SConscript
+if HAVE_SHARED_GLAPI
+SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
+SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+endif
+
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/mapi \
@@ -34,6 +39,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/mesa/main \
$(X11_INCLUDES) \
+ $(SHARED_GLAPI_CFLAGS) \
$(DEFINES)
if HAVE_X11_DRIVER
@@ -66,6 +72,7 @@ GL_PATCH = 0
lib@GL_LIB@_la_LIBADD = \
$(top_builddir)/src/mesa/libmesa.la \
$(top_builddir)/src/mapi/glapi/libglapi.la \
+ $(SHARED_GLAPI_LIB) \
$(GL_LIB_DEPS)
lib@GL_LIB@_la_LDFLAGS = \