diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-05 15:03:04 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-05 15:03:44 -0800 |
| commit | 741744f691d6ef63e9f9a4c03136f969f2ffb0bf (patch) | |
| tree | 7c9192a0648c2d90bb08efbc21ebcb7a6e2b873a /src/mesa/drivers/dri/i965/Makefile.am | |
| parent | 9645b8eb1f1b79e537ad8ddb683507df7bc9da58 (diff) | |
| parent | eb63640c1d38a200a7b1540405051d3ff79d0d8a (diff) | |
Merge commit mesa-public/master into vulkan
This pulls in the patches that move all of the compiler stuff around
Diffstat (limited to 'src/mesa/drivers/dri/i965/Makefile.am')
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am index ad687bf59a4..0db5a51e725 100644 --- a/src/mesa/drivers/dri/i965/Makefile.am +++ b/src/mesa/drivers/dri/i965/Makefile.am @@ -33,8 +33,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \ -I$(top_srcdir)/src/gtest/include \ - -I$(top_srcdir)/src/glsl/nir \ - -I$(top_builddir)/src/glsl/nir \ + -I$(top_builddir)/src/compiler/nir \ -I$(top_builddir)/src/mesa/drivers/dri/common \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ |