diff options
author | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
commit | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (patch) | |
tree | cdad95c688236c6e2e36f13a3495c498393dabc8 /mesalib/src/gallium/Automake.inc | |
parent | feab85024204c7db3ad243697fe06bf3960349a9 (diff) | |
parent | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (diff) | |
download | vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.gz vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.bz2 vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/gallium/Automake.inc')
-rw-r--r-- | mesalib/src/gallium/Automake.inc | 69 |
1 files changed, 57 insertions, 12 deletions
diff --git a/mesalib/src/gallium/Automake.inc b/mesalib/src/gallium/Automake.inc index 1acc99ef5..1f5d532e4 100644 --- a/mesalib/src/gallium/Automake.inc +++ b/mesalib/src/gallium/Automake.inc @@ -54,41 +54,72 @@ GALLIUM_VIDEO_CFLAGS = \ DRI_VERSION_SCRIPT ?= $(top_srcdir)/src/gallium/state_trackers/dri/dri.link GALLIUM_DRI_LINKER_FLAGS = \ + -shared \ + -shrext .so \ -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) \ + $(LD_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) \ + $(LD_NO_UNDEFINED) + +GALLIUM_OMX_LINKER_FLAGS = \ + -shared \ + -module \ + -no-undefined \ + -export-symbols-regex $(EXPORTS) \ + $(GC_SECTIONS) \ + $(LD_NO_UNDEFINED) + +GALLIUM_COMMON_LIB_DEPS = \ + -lm \ + $(CLOCK_LIB) \ + $(PTHREAD_LIBS) \ + $(DLOPEN_LIBS) + +GALLIUM_DRI_LIB_DEPS = \ + $(top_builddir)/src/mesa/libmesagallium.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(SELINUX_LIBS) \ + $(LIBDRM_LIBS) \ + $(EXPAT_LIBS) \ + $(GALLIUM_COMMON_LIB_DEPS) GALLIUM_VDPAU_LIB_DEPS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \ $(VDPAU_LIBS) \ $(LIBDRM_LIBS) \ - -lm \ - $(CLOCK_LIB) \ - $(PTHREAD_LIBS) \ - $(DLOPEN_LIBS) + $(GALLIUM_COMMON_LIB_DEPS) GALLIUM_XVMC_LIB_DEPS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \ $(XVMC_LIBS) \ - $(LIBDRM_LIBS) + $(LIBDRM_LIBS) \ + $(GALLIUM_COMMON_LIB_DEPS) + +GALLIUM_OMX_LIB_DEPS = \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \ + $(OMX_LIBS) \ + $(GALLIUM_COMMON_LIB_DEPS) GALLIUM_WINSYS_CFLAGS = \ -I$(top_srcdir)/include \ @@ -96,3 +127,17 @@ GALLIUM_WINSYS_CFLAGS = \ -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 |