diff options
| author | Matt Turner <[email protected]> | 2013-01-14 22:00:08 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2013-01-22 14:33:20 -0800 |
| commit | 86d30dea3c13d29ef8d39bc18db63a0441051975 (patch) | |
| tree | 39b2dd61d813609c1e8e3982cbde9ac0f93837b2 /src/glsl/Makefile.sources | |
| parent | cc9f609cb9175e727b91f8dffa5800818be582da (diff) | |
glsl/build: Build glcpp via the glsl Makefile
Removing the subdirectory recursion provides a small speed up.
Tested-by: Andreas Boll <[email protected]>
Diffstat (limited to 'src/glsl/Makefile.sources')
| -rw-r--r-- | src/glsl/Makefile.sources | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources index 2227c5ef596..7955d34550b 100644 --- a/src/glsl/Makefile.sources +++ b/src/glsl/Makefile.sources @@ -6,6 +6,7 @@ GLSL_BUILDDIR = $(top_builddir)/src/glsl # libglcpp LIBGLCPP_FILES = \ + $(GLSL_SRCDIR)/ralloc.c \ $(GLSL_SRCDIR)/glcpp/pp.c LIBGLCPP_GENERATED_FILES = \ @@ -84,8 +85,7 @@ LIBGLSL_FILES = \ $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \ $(GLSL_SRCDIR)/opt_tree_grafting.cpp \ $(GLSL_SRCDIR)/s_expression.cpp \ - $(GLSL_SRCDIR)/strtod.c \ - $(GLSL_SRCDIR)/ralloc.c + $(GLSL_SRCDIR)/strtod.c # glsl_compiler @@ -103,8 +103,8 @@ BUILTIN_COMPILER_CXX_FILES = \ $(GLSL_SRCDIR)/builtin_stubs.cpp BUILTIN_COMPILER_GENERATED_CXX_FILES = \ - $(GLSL_BUILDDIR)/glsl_lexer.cc \ - $(GLSL_BUILDDIR)/glsl_parser.cc + $(GLSL_BUILDDIR)/glsl_lexer.cpp \ + $(GLSL_BUILDDIR)/glsl_parser.cpp # libglsl generated sources LIBGLSL_GENERATED_CXX_FILES = \ |