diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
| commit | 01102cdf33d68a7be192a139752831ff93dee117 (patch) | |
| tree | 84cc702a6d5bb77647f6df3840b41eb9a7b9faf4 /mesalib/src/glsl/Makefile.sources | |
| parent | dcf9ae77854778629cabd0d6943dda3678eb91fa (diff) | |
| parent | d09d7be8bbbb39926f44834023d7120535155829 (diff) | |
| download | vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.gz vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.bz2 vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mesalib/src/glsl/Makefile.sources')
| -rw-r--r-- | mesalib/src/glsl/Makefile.sources | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/Makefile.sources b/mesalib/src/glsl/Makefile.sources index 0425fa33e..f2743f750 100644 --- a/mesalib/src/glsl/Makefile.sources +++ b/mesalib/src/glsl/Makefile.sources @@ -101,8 +101,8 @@ BUILTIN_COMPILER_CXX_FILES = \ $(GLSL_SRCDIR)/builtin_stubs.cpp BUILTIN_COMPILER_GENERATED_CXX_FILES = \ - $(GLSL_SRCDIR)/glsl_lexer.cpp \ - $(GLSL_SRCDIR)/glsl_parser.cpp + $(GLSL_SRCDIR)/glsl_lexer.cc \ + $(GLSL_SRCDIR)/glsl_parser.cc # libglsl generated sources LIBGLSL_GENERATED_CXX_FILES = \ |