From 603160d4c0ff3b5ec594aed4ee7f8e161626946d Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Tue, 20 Aug 2013 10:44:53 +0200 Subject: gallium/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. I could swear I've done this before, maybe there was a glitch in the matrix. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47824 Cc: "9.2" Signed-off-by: Maarten Lankhorst --- src/gallium/targets/osmesa/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am index e187a47bc33..38dbeb85f25 100644 --- a/src/gallium/targets/osmesa/Makefile.am +++ b/src/gallium/targets/osmesa/Makefile.am @@ -40,10 +40,9 @@ lib@OSMESA_LIB@_la_SOURCES = target.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 = \ -- cgit v1.2.3