summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2016-04-15 15:32:18 -0700
committerJason Ekstrand <[email protected]>2016-04-21 20:44:27 -0700
commitef5dca2034b347eb676a973be0702e8796a59174 (patch)
tree0f448c2de51a631c9c0aae4aa8fe9b479d68ba10 /src/mesa
parentfe3b1e14480f303614c9c834f54615e75ec2392a (diff)
i965: Add a dependency on libisl
To avoid build issues, ensure that you're running `make' at the top level and/or you've executed `make clean' beforehand. Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.am7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index ba3aa267bbf..1049d4a4916 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -34,6 +34,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
-I$(top_srcdir)/src/gtest/include \
-I$(top_srcdir)/src/compiler/nir \
+ -I$(top_srcdir)/src/intel \
-I$(top_builddir)/src/compiler/nir \
-I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \
@@ -48,7 +49,10 @@ brw_nir_trig_workarounds.c: brw_nir_trig_workarounds.py $(top_srcdir)/src/compil
noinst_LTLIBRARIES = libi965_dri.la libi965_compiler.la
libi965_dri_la_SOURCES = $(i965_FILES)
-libi965_dri_la_LIBADD = libi965_compiler.la $(INTEL_LIBS)
+libi965_dri_la_LIBADD = \
+ $(top_builddir)/src/intel/isl/libisl.la \
+ libi965_compiler.la \
+ $(INTEL_LIBS)
libi965_compiler_la_SOURCES = \
$(i965_compiler_FILES) \
@@ -60,6 +64,7 @@ CLEANFILES = $(BUILT_SOURCES)
TEST_LIBS = \
libi965_compiler.la \
../../../libmesa.la \
+ $(top_builddir)/src/intel/isl/libisl.la \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS) \
../common/libdri_test_stubs.la