diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
| commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
| tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/src/glsl/Makefile.sources | |
| parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
| parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
| download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/src/glsl/Makefile.sources')
| -rw-r--r-- | mesalib/src/glsl/Makefile.sources | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mesalib/src/glsl/Makefile.sources b/mesalib/src/glsl/Makefile.sources index aafb53eae..5e098fc05 100644 --- a/mesalib/src/glsl/Makefile.sources +++ b/mesalib/src/glsl/Makefile.sources @@ -15,10 +15,6 @@ LIBGLCPP_GENERATED_FILES = \ # libglsl LIBGLSL_FILES = \ - $(GLSL_SRCDIR)/strtod.c \ - $(GLSL_SRCDIR)/ralloc.c - -LIBGLSL_CXX_FILES = \ $(GLSL_SRCDIR)/ast_expr.cpp \ $(GLSL_SRCDIR)/ast_function.cpp \ $(GLSL_SRCDIR)/ast_to_hir.cpp \ @@ -85,7 +81,9 @@ LIBGLSL_CXX_FILES = \ $(GLSL_SRCDIR)/opt_structure_splitting.cpp \ $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \ $(GLSL_SRCDIR)/opt_tree_grafting.cpp \ - $(GLSL_SRCDIR)/s_expression.cpp + $(GLSL_SRCDIR)/s_expression.cpp \ + $(GLSL_SRCDIR)/strtod.c \ + $(GLSL_SRCDIR)/ralloc.c # glsl_compiler @@ -95,7 +93,7 @@ GLSL_COMPILER_CXX_FILES = \ # builtin_compiler # -# This is built before libglsl to generate builtin_funciton.cpp for libglsl. +# This is built before libglsl to generate builtin_function.cpp for libglsl. # For this to work, a dummy version of builtin_function.cpp, # builtin_stubs.cpp, is used. |