diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-09-27 13:56:27 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-10-01 15:23:05 -0700 |
| commit | 1762ec28db4bfb85eeb6e61377839a3889f77216 (patch) | |
| tree | bc657b93ec5f1c79c02e83872547a458a6ae53cd | |
| parent | 4cfff7211c7897353a07c48ad80a681c8e1e8298 (diff) | |
build: Link OSMesa with glapi, libdl, libstdc++
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=399813
https://bugs.freedesktop.org/show_bug.cgi?id=53179
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index 6d087f27653..21b8dfb7638 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -21,24 +21,31 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -# Hack to make some of the non-automake variables work. -TOP=$(top_builddir) - -AM_CFLAGS = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa/ \ $(DEFINES) \ $(API_DEFINES) +AM_CFLAGS = $(PTHREAD_CFLAGS) +AM_CXXFLAGS = $(PTHREAD_CFLAGS) lib_LTLIBRARIES = lib@OSMESA_LIB@.la +nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp 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 +endif lib@OSMESA_LIB@_la_LIBADD = \ $(top_builddir)/src/mesa/libmesa.la \ - $(top_builddir)/src/mapi/glapi/libglapi.la + $(GLAPI_LIB) \ + $(OSMESA_LIB_DEPS) if BUILD_SHARED # Provide compatibility with scripts for the old Mesa build system for |