On Tue, May 13, 2014 at 7:15 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > With this and the previous patch, we no longer have multiple > definitions in the final egl_gallium.so. Looks good to me. > > Cc: Chia-I Wu <o...@lunarg.com> > Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> > --- > src/gallium/targets/egl-static/Makefile.am | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/src/gallium/targets/egl-static/Makefile.am > b/src/gallium/targets/egl-static/Makefile.am > index 332b38d..4378fa3 100644 > --- a/src/gallium/targets/egl-static/Makefile.am > +++ b/src/gallium/targets/egl-static/Makefile.am > @@ -75,10 +75,6 @@ if HAVE_MESA_LLVM > AM_LDFLAGS += $(LLVM_LDFLAGS) > endif > > -egl_gallium_la_LDFLAGS = \ > - $(AM_LDFLAGS) \ > - -Wl,--allow-multiple-definition > - > if HAVE_EGL_PLATFORM_X11 > AM_CPPFLAGS += $(LIBDRM_CFLAGS) > egl_gallium_la_LIBADD += \ > @@ -183,6 +179,11 @@ egl_gallium_la_LIBADD += \ > $(NOUVEAU_LIBS) > endif > > +if NEED_RADEON_DRM_WINSYS > +egl_gallium_la_LIBADD += \ > + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la > +endif > + > if HAVE_GALLIUM_RADEON_COMMON > egl_gallium_la_LIBADD += \ > $(top_builddir)/src/gallium/drivers/radeon/libradeon.la > @@ -191,7 +192,6 @@ endif > if HAVE_GALLIUM_R300 > AM_CPPFLAGS += -D_EGL_PIPE_R300=1 > egl_gallium_la_LIBADD += \ > - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ > $(top_builddir)/src/gallium/drivers/r300/libr300.la \ > $(RADEON_LIBS) > endif > @@ -199,7 +199,6 @@ endif > if HAVE_GALLIUM_R600 > AM_CPPFLAGS += -D_EGL_PIPE_R600=1 > egl_gallium_la_LIBADD += \ > - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ > $(top_builddir)/src/gallium/drivers/r600/libr600.la \ > $(RADEON_LIBS) > endif > @@ -207,7 +206,6 @@ endif > if HAVE_GALLIUM_RADEONSI > AM_CPPFLAGS += -D_EGL_PIPE_RADEONSI=1 > egl_gallium_la_LIBADD += \ > - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ > $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ > $(RADEON_LIBS) > endif > -- > 1.9.2 >
-- o...@lunarg.com _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
