aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-28 12:47:32 +0000
committermarha <marha@users.sourceforge.net>2011-02-28 12:47:32 +0000
commit717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed (patch)
tree1512dddc255b89d5d3ec35bfc541a357184a7d7f /mesalib/src/glsl
parent46ff5affddfec90a099d55945ab2f857a5a75e57 (diff)
parentfeee2b5ceb37101bd1c4162e49805e6ad63e28ae (diff)
downloadvcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.tar.gz
vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.tar.bz2
vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl')
-rw-r--r--mesalib/src/glsl/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index f964b7487..7660cb3dd 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -208,6 +208,6 @@ builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler
@echo Regenerating builtin_function.cpp...
- $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp
+ $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp
-include depend