diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-31 18:04:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-31 18:04:51 +0200 |
| commit | edb5b380994125bf33929ef7dc5a3c456dfbe93b (patch) | |
| tree | d5bb36474f380ce6c15d9f1b46e8f794cc6e8f9f /mesalib/src/gallium | |
| parent | 6469a282ad06dfa53f3b9d9e9789f21b76de9ab7 (diff) | |
| download | vcxsrv-edb5b380994125bf33929ef7dc5a3c456dfbe93b.tar.gz vcxsrv-edb5b380994125bf33929ef7dc5a3c456dfbe93b.tar.bz2 vcxsrv-edb5b380994125bf33929ef7dc5a3c456dfbe93b.zip | |
libxtrans mesa git update 31 Mar 2014
libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4
mesa commit d681b22ed77274a805c6c8e81925c18eeb57a968
Diffstat (limited to 'mesalib/src/gallium')
| -rw-r--r-- | mesalib/src/gallium/Automake.inc | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/mesalib/src/gallium/Automake.inc b/mesalib/src/gallium/Automake.inc index 1acc99ef5..56f1433a0 100644 --- a/mesalib/src/gallium/Automake.inc +++ b/mesalib/src/gallium/Automake.inc @@ -54,25 +54,37 @@ GALLIUM_VIDEO_CFLAGS = \ DRI_VERSION_SCRIPT ?= $(top_srcdir)/src/gallium/state_trackers/dri/dri.link GALLIUM_DRI_LINKER_FLAGS = \ + -shared \ -module \ -avoid-version \ - -Wl,--version-script=$(DRI_VERSION_SCRIPT) \ - -shared \ - -no-undefined + $(GC_SECTIONS) \ + -Wl,--version-script=$(DRI_VERSION_SCRIPT) GALLIUM_VDPAU_LINKER_FLAGS = \ + -shared \ -module \ + -no-undefined \ -version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \ -export-symbols-regex $(VDPAU_EXPORTS) \ - -shared \ - -no-undefined + $(GC_SECTIONS) \ + -Wl,--no-undefined GALLIUM_XVMC_LINKER_FLAGS = \ + -shared \ -module \ + -no-undefined \ -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \ - -shared \ -export-symbols-regex '^XvMC' \ - -no-undefined + $(GC_SECTIONS) \ + -Wl,--no-undefined + +GALLIUM_OMX_LINKER_FLAGS = \ + -shared \ + -module \ + -no-undefined \ + -export-symbols-regex $(EXPORTS) \ + $(GC_SECTIONS) \ + -Wl,--no-undefined GALLIUM_VDPAU_LIB_DEPS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ @@ -90,9 +102,29 @@ 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 \ -I$(top_srcdir)/src/gallium/auxiliary \ $(DEFINES) \ $(VISIBILITY_CFLAGS) + +if HAVE_MESA_LLVM + +GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS) +GALLIUM_VDPAU_LINKER_FLAGS += $(LLVM_LDFLAGS) +GALLIUM_XVMC_LINKER_FLAGS += $(LLVM_LDFLAGS) +GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS) + +GALLIUM_DRI_LIB_DEPS += $(LLVM_LIBS) +GALLIUM_VDPAU_LIB_DEPS += $(LLVM_LIBS) +GALLIUM_XVMC_LIB_DEPS += $(LLVM_LIBS) +GALLIUM_OMX_LIB_DEPS += $(LLVM_LIBS) + +endif |