summaryrefslogtreecommitdiffstats
path: root/src/compiler/Makefile.am
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-05-25 16:00:38 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-05-26 14:13:38 -0700
commit32210dea8e474f8e93f5df681fb6a8265a0cda4b (patch)
treec25fdd05d4f55131c161b7197b5ebf09eb5cf503 /src/compiler/Makefile.am
parentddcfc35f62ed3ad83b100beacb5b30394dcd9960 (diff)
downloadexternal_mesa3d-32210dea8e474f8e93f5df681fb6a8265a0cda4b.zip
external_mesa3d-32210dea8e474f8e93f5df681fb6a8265a0cda4b.tar.gz
external_mesa3d-32210dea8e474f8e93f5df681fb6a8265a0cda4b.tar.bz2
compiler: Move glsl_to_nir to libglsl.la
Right now libglsl.la depends on libnir.la so putting it in libnir.la adds a dependency on libglsl.la that goes the wrong direction. Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Diffstat (limited to 'src/compiler/Makefile.am')
-rw-r--r--src/compiler/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index dc30f90..50e87bb 100644
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -31,6 +31,8 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/compiler/glsl\
-I$(top_srcdir)/src/compiler/glsl\
-I$(top_srcdir)/src/compiler/glsl/glcpp\
+ -I$(top_builddir)/src/compiler/nir \
+ -I$(top_srcdir)/src/compiler/nir \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gtest/include \