drivers/x11: fix the build against shared_glapi
authorEmil Velikov <emil.l.velikov@gmail.com>
Fri, 19 Jun 2015 16:28:25 +0000 (17:28 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Tue, 23 Jun 2015 16:04:21 +0000 (17:04 +0100)
Cc: Brian Paul <brianp@vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Jose Fonseca <jfonseca@vmware.com>
src/mesa/drivers/x11/Makefile.am

index c0596f8119edff91527c89977fe8d601cbbca737..a8847e8a7ac446a7b008792e954b70576d88acf4 100644 (file)
 
 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 = \