From 1a882fd2ee84ae28a06cf07902dc4645d8ad4a6d Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 18 Jan 2016 10:47:13 +0200 Subject: nir: move shader_enums.[ch] to compiler This way one can reuse it in glsl, nir or other infrastructure without pulling nir as dependency. Signed-off-by: Emil Velikov Acked-by: Matt Turner Acked-by: Jose Fonseca --- src/glsl/Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/glsl/Makefile.am') diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index ba7af7c779d..07d5267df5a 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -137,7 +137,10 @@ glcpp_glcpp_LDADD = \ $(top_builddir)/src/libglsl_util.la \ -lm -libglsl_la_LIBADD = libglcpp.la +libglsl_la_LIBADD = \ + $(top_builddir)/src/compiler/libcompiler.la \ + libglcpp.la + libglsl_la_SOURCES = \ glsl_lexer.cpp \ glsl_parser.cpp \ @@ -147,6 +150,9 @@ libglsl_la_SOURCES = \ $(NIR_GENERATED_FILES) \ $(GLSL_TO_NIR_FILES) +libnir_la_LIBADD = \ + $(top_builddir)/src/compiler/libcompiler.la + libnir_la_SOURCES = \ $(NIR_FILES) \ $(NIR_GENERATED_FILES) -- cgit v1.2.3