fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

libgl-xlib/build: Link with C++ when LLVM is used

Browse source 
Also link-in libX11 and libXext.

Tested-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Matt Turner 2013-01-23 12:45:40 -08:00
parent b50c0feb2c
commit 0412864ae8
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/targets/libgl-xlib/Makefile.am
View file

@ -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