diff options
| author | Matt Turner <mattst88@gmail.com> | 2013-01-23 12:45:40 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2013-01-24 14:00:27 -0800 |
| commit | 0412864ae83c0a73b611c81611643994076d503c (patch) | |
| tree | 20fe5e74ef84d360a5cebd792f2aabef3d0ab5c3 /src/gallium/targets/libgl-xlib | |
| parent | b50c0feb2ccf3a4e1be8133405347ee3b49b05cf (diff) | |
| download | external_mesa3d-0412864ae83c0a73b611c81611643994076d503c.zip external_mesa3d-0412864ae83c0a73b611c81611643994076d503c.tar.gz external_mesa3d-0412864ae83c0a73b611c81611643994076d503c.tar.bz2 | |
libgl-xlib/build: Link with C++ when LLVM is used
Also link-in libX11 and libXext.
Tested-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium/targets/libgl-xlib')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index 5889a87..cca0da4 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -54,13 +54,21 @@ libGL_la_LIBADD = \ $(top_builddir)/src/mapi/glapi/libglapi.la \ $(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(PTHREAD_LIBS) \ + $(GL_LIB_DEPS) \ $(CLOCK_LIB) if HAVE_MESA_LLVM +libGL_la_LINK = $(CXXLINK) $(libGL_la_LDFLAGS) +# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable +nodist_EXTRA_libGL_la_SOURCES = dummy-cpp.cpp + libGL_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) AM_CPPFLAGS += -DGALLIUM_LLVMPIPE libGL_la_LDFLAGS += $(LLVM_LDFLAGS) +else +libGL_la_LINK = $(CXXLINK) $(libGL_la_LDFLAGS) +# Mention a dummy pure C file to trigger generation of the $(LINK) variable +nodist_EXTRA_libGL_la_SOURCES = dummy-c.c endif # Provide compatibility with scripts for the old Mesa build system for |