diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-12 20:34:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-12 20:34:04 +0000 |
| commit | 2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85 (patch) | |
| tree | 276bf91b61421f0043fc8ac00a13af467ecc10f2 /mesalib/src/glsl/Makefile | |
| parent | 4613071e75e4828ce69ac1f17d73b0b7b6275578 (diff) | |
| download | vcxsrv-2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85.tar.gz vcxsrv-2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85.tar.bz2 vcxsrv-2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85.zip | |
xkeyboard-config libX11 mesalib git update 12 jan 2011
Diffstat (limited to 'mesalib/src/glsl/Makefile')
| -rw-r--r-- | mesalib/src/glsl/Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile index b8ed5ae88..f522aa577 100644 --- a/mesalib/src/glsl/Makefile +++ b/mesalib/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
|