mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

i915: use different CFLAGS/LIBS variables than i965/anv 

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Lionel Landwerlin 2017-06-15 12:28:07 +01:00
parent 230691b8e5
commit 3c50ebce25
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -1830,7 +1830,7 @@ if test -n "$with_dri_drivers"; then
xi915)
require_libdrm "i915"
HAVE_I915_DRI=yes
PKG_CHECK_MODULES([INTEL], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
PKG_CHECK_MODULES([I915], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
;;
xi965)
require_libdrm "i965"
@ -2418,7 +2418,7 @@ if test -n "$with_gallium_drivers"; then
;;
xi915)
HAVE_GALLIUM_I915=yes
PKG_CHECK_MODULES([INTEL], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
PKG_CHECK_MODULES([I915], [libdrm >= $LIBDRM_INTEL_REQUIRED libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
require_libdrm "Gallium i915"
;;
xr300)

2
src/gallium/drivers/i915/Automake.inc
View File

@ -5,7 +5,7 @@ TARGET_CPPFLAGS += -DGALLIUM_I915
TARGET_LIB_DEPS += \
$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
$(top_builddir)/src/gallium/drivers/i915/libi915.la \
$(INTEL_LIBS) \
$(I915_LIBS) \
$(LIBDRM_LIBS)
endif

2
src/gallium/targets/pipe-loader/Makefile.am
View File

@ -86,7 +86,7 @@ pipe_i915_la_LIBADD = \
$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
$(top_builddir)/src/gallium/drivers/i915/libi915.la \
$(LIBDRM_LIBS) \
$(INTEL_LIBS)
$(I915_LIBS)
endif

2
src/gallium/winsys/i915/drm/Makefile.am
View File

@ -26,7 +26,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
-I$(top_srcdir)/src/gallium/drivers \
$(GALLIUM_WINSYS_CFLAGS) \
$(INTEL_CFLAGS)
$(I915_CFLAGS)
noinst_LTLIBRARIES = libi915drm.la

4
src/mesa/drivers/dri/i915/Makefile.am
View File

@ -34,8 +34,8 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
$(INTEL_CFLAGS)
$(I915_CFLAGS)
noinst_LTLIBRARIES = libi915_dri.la
libi915_dri_la_SOURCES = $(i915_FILES)
libi915_dri_la_LIBADD = $(INTEL_LIBS)
libi915_dri_la_LIBADD = $(I915_LIBS)