Otherwise egl_gallium.so fails to load for all drivers if we build r600 and radeonsi together. --- Now we should be able to merge automake branch :) --- src/gallium/drivers/radeon/Makefile.am | 9 +++++++++ 1 Datei geändert, 9 Zeilen hinzugefügt(+)
diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am index adb5ebe..37780c0 100644 --- a/src/gallium/drivers/radeon/Makefile.am +++ b/src/gallium/drivers/radeon/Makefile.am @@ -1,7 +1,16 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc +if HAVE_GALLIUM_R600 +if HAVE_GALLIUM_RADEONSI +lib_LTLIBRARIES = libradeon.la +libradeon_la_LDFLAGS = -avoid-version -module +else noinst_LTLIBRARIES = libradeon.la +endif +else +noinst_LTLIBRARIES = libradeon.la +endif AM_CXXFLAGS = \ $(filter-out -DDEBUG, $(LLVM_CXXFLAGS)) \ -- 1.7.10.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev