diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-06-19 17:28:25 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-06-23 17:04:21 +0100 |
| commit | b92233f2a57ec09e9266ba4ed7f200904b784b9a (patch) | |
| tree | 247fbb97f13fc2819cd21d2e041f946a90e608c5 | |
| parent | 6d744aaf4e427b6b0b3d8d35d756592a50abbb97 (diff) | |
| download | external_mesa3d-b92233f2a57ec09e9266ba4ed7f200904b784b9a.zip external_mesa3d-b92233f2a57ec09e9266ba4ed7f200904b784b9a.tar.gz external_mesa3d-b92233f2a57ec09e9266ba4ed7f200904b784b9a.tar.bz2 | |
drivers/x11: fix the build against shared_glapi
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>
| -rw-r--r-- | src/mesa/drivers/x11/Makefile.am | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am index c0596f8..a8847e8 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 = \ |