Module: Mesa
Branch: master
Commit: a3e9582f09249ad27716ba82c7dfcee685b65d51
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=a3e9582f09249ad27716ba82c7dfcee685b65d51
Author: Emil Velikov <emil.l.veli...@gmail.com>
Date: Wed Sep 24 11:54:07 2014 +0100
targets/vl: don't forget to set GALLIUM_STATIC_TARGETS
git rebase failure while dropping out a patch that reworks
the way we build aux/vl.
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
src/gallium/targets/omx/Makefile.am | 2 +-
src/gallium/targets/vdpau/Makefile.am | 2 +-
src/gallium/targets/xvmc/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/targets/omx/Makefile.am
b/src/gallium/targets/omx/Makefile.am
index 8d1e585..4be1063 100644
--- a/src/gallium/targets/omx/Makefile.am
+++ b/src/gallium/targets/omx/Makefile.am
@@ -43,7 +43,7 @@ include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
libomx_mesa_la_SOURCES += target.c
-libomx_mesa_la_CPPFLAGS = $(TARGET_CPPFLAGS)
+libomx_mesa_la_CPPFLAGS = $(TARGET_CPPFLAGS) -DGALLIUM_STATIC_TARGETS=1
libomx_mesa_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
diff --git a/src/gallium/targets/vdpau/Makefile.am
b/src/gallium/targets/vdpau/Makefile.am
index ce22508..9bec6a3 100644
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -48,7 +48,7 @@ include
$(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
if HAVE_GALLIUM_STATIC_TARGETS
libvdpau_gallium_la_SOURCES += target.c
-libvdpau_gallium_la_CPPFLAGS = $(TARGET_CPPFLAGS)
+libvdpau_gallium_la_CPPFLAGS = $(TARGET_CPPFLAGS) -DGALLIUM_STATIC_TARGETS=1
libvdpau_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
diff --git a/src/gallium/targets/xvmc/Makefile.am
b/src/gallium/targets/xvmc/Makefile.am
index c78aadf..9bef87a 100644
--- a/src/gallium/targets/xvmc/Makefile.am
+++ b/src/gallium/targets/xvmc/Makefile.am
@@ -43,7 +43,7 @@ include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
if HAVE_GALLIUM_STATIC_TARGETS
libXvMCgallium_la_SOURCES += target.c
-libXvMCgallium_la_CPPFLAGS = $(TARGET_CPPFLAGS)
+libXvMCgallium_la_CPPFLAGS = $(TARGET_CPPFLAGS) -DGALLIUM_STATIC_TARGETS=1
libXvMCgallium_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
