diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-07-16 10:18:38 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-07-16 10:18:40 +0200 |
| commit | b20b2b6dc8b72fc099afb9690f61596e1d0b0902 (patch) | |
| tree | edae2a06b73b582c1d66b47189bf2ce40e492382 | |
| parent | 121ea0b38bfee093e0bde0ff1443fc2efec688b0 (diff) | |
osmesa: link against static libglapi library too to get the gl exports
This should fix missing symbols in a osmesa built against shared glapi
osmesa build. All opengl exports were missing that are defined in the
static glapi, so link against both to fix this.
This is a candidate for the stable series.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47824
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index 082c294a3e..a1c0bb5b3e 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -39,11 +39,11 @@ lib@OSMESA_LIB@_la_SOURCES = osmesa.c lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined -if HAVE_SHARED_GLAPI -GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la -else GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la +if HAVE_SHARED_GLAPI +GLAPI_LIB += $(top_builddir)/src/mapi/shared-glapi/libglapi.la endif + lib@OSMESA_LIB@_la_LIBADD = \ $(top_builddir)/src/mesa/libmesa.la \ $(GLAPI_LIB) \ |