diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-17 14:17:54 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-17 14:17:54 +0000 |
| commit | 76b655664dad149451d0abaa15929d1b7b62e0c6 (patch) | |
| tree | e7c3389fec52eaad405e2025e04555766493022c /mesalib/src/glsl/Makefile | |
| parent | a44b2f0d059871926ffb84dabdae53ddaa390beb (diff) | |
| parent | d7f1bd4112420f1d4b41c5409074eca6b34bf507 (diff) | |
| download | vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.tar.gz vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.tar.bz2 vcxsrv-76b655664dad149451d0abaa15929d1b7b62e0c6.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 8059bb472..b63307f53 100644 --- a/mesalib/src/glsl/Makefile +++ b/mesalib/src/glsl/Makefile @@ -204,7 +204,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) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@
+ $(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -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...
|