diff options
| author | Matt Turner <[email protected]> | 2013-01-17 23:51:04 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-01-22 14:33:45 -0800 |
| commit | 0d108116bd80b757fb01a84a9f1946ef870b57b8 (patch) | |
| tree | 953e1275b8d2e60237aacccef27a7373a1e4c0ea /src/glsl/builtin_compiler | |
| parent | 952e6e9f3b0eb179f67345f00e5a7f1dbaa7bdd5 (diff) | |
glsl/build: Build libglcpp and libglslcore in builtin_compiler
And reuse them if not cross compiling.
Tested-by: Andreas Boll <[email protected]>
Diffstat (limited to 'src/glsl/builtin_compiler')
| -rw-r--r-- | src/glsl/builtin_compiler/Makefile.am | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am index a0255560b03..1a863b228df 100644 --- a/src/glsl/builtin_compiler/Makefile.am +++ b/src/glsl/builtin_compiler/Makefile.am @@ -43,17 +43,20 @@ AM_CXXFLAGS = $(AM_CFLAGS) include ../Makefile.sources noinst_PROGRAMS = builtin_compiler +noinst_LTLIBRARIES = libglslcore.la libglcpp.la + +libglcpp_la_SOURCES = \ + $(LIBGLCPP_GENERATED_FILES) \ + $(LIBGLCPP_FILES) + +libglslcore_la_SOURCES = \ + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ + $(LIBGLSL_FILES) builtin_compiler_SOURCES = \ - $(GLSL_BUILDDIR)/glcpp/glcpp-lex.c \ - $(GLSL_BUILDDIR)/glcpp/glcpp-parse.c \ - $(LIBGLCPP_FILES) \ - $(GLSL_BUILDDIR)/glsl_lexer.cpp \ - $(GLSL_BUILDDIR)/glsl_parser.cpp \ - $(LIBGLSL_FILES) \ - $(LIBGLSL_CXX_FILES) \ - $(top_srcdir)/src/mesa/main/hash_table.c \ - $(top_srcdir)/src/mesa/program/prog_hash_table.c \ - $(top_srcdir)/src/mesa/program/symbol_table.c \ - $(GLSL_COMPILER_CXX_FILES) \ - builtin_stubs.cpp + $(top_srcdir)/src/mesa/main/hash_table.c \ + $(top_srcdir)/src/mesa/program/prog_hash_table.c\ + $(top_srcdir)/src/mesa/program/symbol_table.c \ + $(BUILTIN_COMPILER_CXX_FILES) \ + $(GLSL_COMPILER_CXX_FILES) +builtin_compiler_LDADD = libglslcore.la libglcpp.la |