diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-13 22:07:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-13 22:07:24 +0000 |
| commit | dc54712d6b67dac7fc745cf3b9019b2c4c81f193 (patch) | |
| tree | 002b3fd0e0233fe3e6c57d603a8471794f5ba922 /mesalib/src/glsl/Makefile | |
| parent | ca14143b18b939ee4506936e77478f8c593802b5 (diff) | |
| parent | a0a46bd55d7cbbf70757a29c067e21b70ac4e2df (diff) | |
| download | vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.tar.gz vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.tar.bz2 vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/Makefile')
| -rw-r--r-- | mesalib/src/glsl/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile index f522aa577..22e01415f 100644 --- a/mesalib/src/glsl/Makefile +++ b/mesalib/src/glsl/Makefile @@ -174,7 +174,7 @@ glcpp/glcpp-parse.c: glcpp/glcpp-parse.y bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<
builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o
- $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TALLOC_LIBS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o builtin_compiler
+ $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o $(TALLOC_LIBS) -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...
|