summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorRob Clark <robclark@freedesktop.org>2015-04-03 13:57:46 -0400
committerRob Clark <robclark@freedesktop.org>2015-04-05 09:24:17 -0400
commit1c857727a12a45392b609949046b4abb25e3d7da (patch)
tree179c34aae38f04f630120fe9bf8caf621c0611cf /src/glsl
parent52282fa42d34051b042d20b52e84f32274691e36 (diff)
build: add libnir.la
If we want to use NIR from state trackers that don't already pull in the whole of glsl (ie. anything other than mesa state tracker), we need a separate more minimal libnir. Possibly NIR should be better split out from glsl, but for now, generate a second smaller libnir.la for those who just want NIR but not all of glsl. Signed-off-by: Rob Clark <robclark@freedesktop.org>
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/Makefile.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 6cef9736f90..23c6fe8bb6c 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -68,7 +68,7 @@ TESTS_ENVIRONMENT= \
export PYTHON2=$(PYTHON2); \
export PYTHON_FLAGS=$(PYTHON_FLAGS);
-noinst_LTLIBRARIES = libglsl.la libglcpp.la
+noinst_LTLIBRARIES = libnir.la libglsl.la libglcpp.la
check_PROGRAMS = \
glcpp/glcpp \
glsl_test \
@@ -148,6 +148,12 @@ libglsl_la_SOURCES = \
$(LIBGLSL_FILES) \
$(NIR_FILES)
+libnir_la_SOURCES = \
+ glsl_types.cpp \
+ builtin_types.cpp \
+ glsl_symbol_table.cpp \
+ $(NIR_FILES)
+
glsl_compiler_SOURCES = \
$(GLSL_COMPILER_CXX_FILES)