On Thu, May 26, 2016 at 6:59 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote: > Hi Jason, > > On 26 May 2016 at 02:52, Jason Ekstrand <ja...@jlekstrand.net> wrote: >> 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. >> --- >> src/compiler/Makefile.am | 2 + >> src/compiler/Makefile.nir.am | 5 - >> src/compiler/Makefile.sources | 4 +- >> src/compiler/glsl/glsl_to_nir.cpp | 2026 >> +++++++++++++++++++++++++++++ >> src/compiler/glsl/glsl_to_nir.h | 42 + >> src/compiler/nir/glsl_to_nir.cpp | 2026 >> ----------------------------- >> src/compiler/nir/glsl_to_nir.h | 42 - >> src/mesa/drivers/dri/i965/brw_nir.c | 2 +- >> src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +- >> 9 files changed, 2074 insertions(+), 2077 deletions(-) >> create mode 100644 src/compiler/glsl/glsl_to_nir.cpp >> create mode 100644 src/compiler/glsl/glsl_to_nir.h >> delete mode 100644 src/compiler/nir/glsl_to_nir.cpp >> delete mode 100644 src/compiler/nir/glsl_to_nir.h >> >> diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am >> index dc30f90..710ac5a 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\ > These should be moved and/or duplicated in Makefile.glsl.am shouldn't > they ? Please add space before \, as Matt suggested. > > On the SCons side you'll likely need something like the following. If > it doesn't work out, please cc Jose so that he's aware of things going > crazy.
Android too will need something similar. Rob _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
