aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/gallium
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-05-29 20:46:21 +0200
committermarha <marha@users.sourceforge.net>2014-05-29 20:46:21 +0200
commit816a5430313e07083c5325f0a430126a2e10ec41 (patch)
tree82e47992f52149b83238690062e0c56202cb2ebb /mesalib/src/gallium
parentc2dfa0e8c98b06e050c530d704d75a7e4edad02e (diff)
downloadvcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.tar.gz
vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.tar.bz2
vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.zip
mesa xkeyboard-config git update 29 Mar 2014
xkeyboard-config commit bc3ac1b0d152e929b3532a541596cf9fe286bb9e mesa commit dfd117b8570a69a429e660c069997e78b181ab6d
Diffstat (limited to 'mesalib/src/gallium')
-rw-r--r--mesalib/src/gallium/Automake.inc27
1 files changed, 15 insertions, 12 deletions
diff --git a/mesalib/src/gallium/Automake.inc b/mesalib/src/gallium/Automake.inc
index 70921ecd8..97735abe0 100644
--- a/mesalib/src/gallium/Automake.inc
+++ b/mesalib/src/gallium/Automake.inc
@@ -56,9 +56,6 @@ GALLIUM_DRI_LINKER_FLAGS = \
-shrext .so \
-module \
-avoid-version \
-if HAVE_LD_VERSION_SCRIPT
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym \
-endif
$(GC_SECTIONS)
GALLIUM_VDPAU_LINKER_FLAGS = \
@@ -66,9 +63,6 @@ GALLIUM_VDPAU_LINKER_FLAGS = \
-module \
-no-undefined \
-version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
-if HAVE_LD_VERSION_SCRIPT
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau.sym \
-endif
$(GC_SECTIONS) \
$(LD_NO_UNDEFINED)
@@ -77,9 +71,6 @@ GALLIUM_XVMC_LINKER_FLAGS = \
-module \
-no-undefined \
-version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
-if HAVE_LD_VERSION_SCRIPT
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc.sym \
-endif
$(GC_SECTIONS) \
$(LD_NO_UNDEFINED)
@@ -88,12 +79,24 @@ GALLIUM_OMX_LINKER_FLAGS = \
-module \
-no-undefined \
-avoid-version \
-if HAVE_LD_VERSION_SCRIPT
- -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx.sym \
-endif
$(GC_SECTIONS) \
$(LD_NO_UNDEFINED)
+if HAVE_LD_VERSION_SCRIPT
+GALLIUM_DRI_LINKER_FLAGS += \
+ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/dri.sym
+
+GALLIUM_VDPAU_LINKER_FLAGS += \
+ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/vdpau.sym
+
+GALLIUM_XVMC_LINKER_FLAGS += \
+ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/xvmc.sym
+
+GALLIUM_OMX_LINKER_FLAGS += \
+ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/omx.sym
+endif
+
+
GALLIUM_COMMON_LIB_DEPS = \
-lm \
$(CLOCK_LIB) \