On Fri, Apr 3, 2015 at 2:07 PM, Rob Clark <robdcl...@gmail.com> wrote: > From: Rob Clark <robcl...@freedesktop.org> > > 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 <robcl...@freedesktop.org> > --- > src/glsl/Makefile.am | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am > index 6cef973..23c6fe8 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)
We still have the line above, so doesn't this mean we'll build all the NIR files twice, once in libglsl.a and once in libnir.a? Isn't that a bad thing? Or am I missing something? > > +libnir_la_SOURCES = \ > + glsl_types.cpp \ > + builtin_types.cpp \ > + glsl_symbol_table.cpp \ > + $(NIR_FILES) > + > glsl_compiler_SOURCES = \ > $(GLSL_COMPILER_CXX_FILES) > > -- > 2.1.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
