diff options
| author | Jon TURNEY <[email protected]> | 2013-01-13 23:05:17 +0000 |
|---|---|---|
| committer | Jon TURNEY <[email protected]> | 2013-01-15 10:43:33 +0000 |
| commit | 77dd50d020da587445e8ccd38a0cc3d0484c8065 (patch) | |
| tree | 672cd5aaa470015be3a21e17084d1219ad2092bf | |
| parent | 8443b59a5bca9d4e5a2f700fc3e181cf634ff2b7 (diff) | |
libgl-xlib: softpipe and llvmpipe aren't mutually exclusive at link time
Since automake changes, softpipe and llvmpipe are mutually exclusive at link
time. This doesn't make much sense to me as we can choose between them at
run-time using GALLIUM_DRIVER.
Creating library file: .libs/libGL.dll.a
.libs/xlib.o: In function `sw_screen_create_named':
/jhbuild/checkout/mesa/mesa/src/gallium/targets/libgl-xlib/../../../../src/gallium/auxiliary/target-helpers/inline_sw_helper.h:35:
undefined reference to `_softpipe_create_screen'
Signed-off-by: Jon TURNEY <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index adeb05dcb96..5889a8739de 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -47,6 +47,7 @@ libGL_la_LDFLAGS = -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) -no-undefi libGL_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/glx/libxlib.la \ $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ + $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \ @@ -60,8 +61,6 @@ if HAVE_MESA_LLVM 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_LIBADD += $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la endif # Provide compatibility with scripts for the old Mesa build system for |