On Thu, Mar 27, 2014 at 2:00 PM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > Cc: Christian König <christian.koe...@amd.com> > Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> > --- > src/gallium/Automake.inc | 6 ++++++ > src/gallium/targets/r600/omx/Makefile.am | 5 +---- > src/gallium/targets/radeonsi/omx/Makefile.am | 5 +---- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc > index 1acc99e..39475d7 100644 > --- a/src/gallium/Automake.inc > +++ b/src/gallium/Automake.inc > @@ -90,6 +90,12 @@ GALLIUM_XVMC_LIB_DEPS = \ > $(XVMC_LIBS) \ > $(LIBDRM_LIBS) > > +GALLIUM_OMX_LIB_DEPS = \ > + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ > + $(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \ > + $(GALLIUM_DRI_LIB_DEPS) \ > + $(OMX_LIBS) > + > GALLIUM_WINSYS_CFLAGS = \ > -I$(top_srcdir)/include \ > -I$(top_srcdir)/src/gallium/include \ > diff --git a/src/gallium/targets/r600/omx/Makefile.am > b/src/gallium/targets/r600/omx/Makefile.am > index 98b064f..3776771 100644 > --- a/src/gallium/targets/r600/omx/Makefile.am > +++ b/src/gallium/targets/r600/omx/Makefile.am > @@ -47,13 +47,10 @@ libomx_r600_la_LDFLAGS = \ > -no-undefined > > libomx_r600_la_LIBADD = \ > - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ > $(top_builddir)/src/gallium/drivers/r600/libr600.la \ > - $(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \ > $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ > $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ > - $(GALLIUM_DRI_LIB_DEPS) \ > - $(OMX_LIBS) \ > + $(GALLIUM_OMX_LIB_DEPS) \ > $(LIBDRM_LIBS) \ > $(RADEON_LIBS) \ > -lstdc++
Unrelated, but explicitly linking with -lstdc++ is a hack. Use the dummy.cpp trick to make autotools use C++ linking. There's another instance of this in drivers/nouveau. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
