diff options
| author | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-12 00:48:10 +0100 |
| commit | a96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b (patch) | |
| tree | d106cfea4baa1a9071b42d0e9bc922fad7502ed5 /src/glsl/Makefile | |
| parent | 7965e2fc16853ae0ed0a9cde77346c25feb19b6e (diff) | |
| parent | cc0f604241ee7b536f4c9867573024b8673b0998 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/glsl/Makefile')
| -rw-r--r-- | src/glsl/Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile index 86a577e0aeb..15f70298be3 100644 --- a/src/glsl/Makefile +++ b/src/glsl/Makefile @@ -24,7 +24,6 @@ CXX_SOURCES = \ ast_function.cpp \ ast_to_hir.cpp \ ast_type.cpp \ - builtin_function.cpp \ glsl_lexer.cpp \ glsl_parser.cpp \ glsl_parser_extras.cpp \ @@ -130,8 +129,8 @@ ALL_SOURCES = \ default: depend lib$(LIBNAME).a $(APPS) -lib$(LIBNAME).a: $(OBJECTS) Makefile $(TOP)/src/glsl/Makefile.template - $(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS) +lib$(LIBNAME).a: $(OBJECTS) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template + $(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS) builtin_function.o depend: $(ALL_SOURCES) Makefile rm -f depend @@ -140,7 +139,7 @@ depend: $(ALL_SOURCES) Makefile # Remove .o and backup files clean: - rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak + rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak builtin_function.cpp builtin_function.o builtin_stubs.o builtin_compiler -rm -f $(APPS) # Dummy target @@ -174,13 +173,11 @@ glcpp/glcpp-lex.c: glcpp/glcpp-lex.l glcpp/glcpp-parse.c: glcpp/glcpp-parse.y bison -v -o "$@" --defines=glcpp/glcpp-parse.h $< -builtins: builtin_function.cpp builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py - @echo Bootstrapping the compiler... - cp builtins/tools/builtin_function.cpp . - make glsl_compiler +builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o + $(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(TALLOC_LIBS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o builtin_compiler + +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_function.cpp - @echo Rebuilding the real compiler... - make glsl_compiler + $(PYTHON2) $(PYTHON_FLAGS) builtins/tools/generate_builtins.py $(PWD)/builtin_compiler > builtin_function.cpp -include depend |