diff options
| author | Jason Ekstrand <[email protected]> | 2016-04-15 15:32:18 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-04-21 20:44:27 -0700 |
| commit | ef5dca2034b347eb676a973be0702e8796a59174 (patch) | |
| tree | 0f448c2de51a631c9c0aae4aa8fe9b479d68ba10 | |
| parent | fe3b1e14480f303614c9c834f54615e75ec2392a (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]>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 13 | ||||
| -rw-r--r-- | src/intel/Makefile.am | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 7 |
4 files changed, 17 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 9226a0d99ab..e4ce8fe1ad6 100644 --- a/configure.ac +++ b/configure.ac @@ -2459,7 +2459,8 @@ AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes) AM_CONDITIONAL(HAVE_INTEL_VULKAN, test "x$HAVE_INTEL_VULKAN" = xyes) -AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes) +AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes -o \ + "x$HAVE_I965_DRI" = xyes) AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \ "x$HAVE_GALLIUM_R600" = xyes -o \ diff --git a/src/Makefile.am b/src/Makefile.am index a0572b7a563..1471fa0e48a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,10 +24,19 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi # include only conditionally ? SUBDIRS += compiler +if HAVE_INTEL_DRIVERS +SUBDIRS += intel +endif + if NEED_OPENGL_COMMON SUBDIRS += mesa endif +# This explicitly comes after mesa because it depends on the i965 compiler +if HAVE_INTEL_VULKAN +SUBDIRS += intel/vulkan +endif + SUBDIRS += loader if HAVE_DRI_GLX @@ -56,10 +65,6 @@ EXTRA_DIST = \ AM_CFLAGS = $(VISIBILITY_CFLAGS) AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) -if HAVE_INTEL_DRIVERS -SUBDIRS += intel -endif - AM_CPPFLAGS = \ -I$(top_srcdir)/include/ \ -I$(top_srcdir)/src/mapi/ \ diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am index c3673c6e7c8..520602dd290 100644 --- a/src/intel/Makefile.am +++ b/src/intel/Makefile.am @@ -20,7 +20,3 @@ # IN THE SOFTWARE. SUBDIRS = genxml isl - -if HAVE_INTEL_VULKAN -SUBDIRS += vulkan -endif 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 |