diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-08-20 10:44:53 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-08-20 10:44:53 +0200 |
| commit | 603160d4c0ff3b5ec594aed4ee7f8e161626946d (patch) | |
| tree | e4d376838dac79012b701d36da2a621ae2174792 /src/gallium/targets/osmesa | |
| parent | a4ff1fd388369dbf80d324c84502b28b5f9d3da4 (diff) | |
| download | external_mesa3d-603160d4c0ff3b5ec594aed4ee7f8e161626946d.zip external_mesa3d-603160d4c0ff3b5ec594aed4ee7f8e161626946d.tar.gz external_mesa3d-603160d4c0ff3b5ec594aed4ee7f8e161626946d.tar.bz2 | |
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" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'src/gallium/targets/osmesa')
| -rw-r--r-- | src/gallium/targets/osmesa/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am index e187a47..38dbeb8 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 = \ |