diff options
| -rw-r--r-- | Makefile | 24 | ||||
| -rw-r--r-- | ast_to_hir.cpp (renamed from ast_to_hir.cc) | 0 | ||||
| -rw-r--r-- | glsl_parser_extras.cpp (renamed from glsl_parser_extras.cc) | 0 | ||||
| -rw-r--r-- | hir_field_selection.cpp (renamed from hir_field_selection.cc) | 0 | ||||
| -rw-r--r-- | ir.cpp (renamed from ir.cc) | 0 |
5 files changed, 12 insertions, 12 deletions
@@ -1,7 +1,7 @@ CSRCS = symbol_table.c hash_table.c glsl_types.c -CCSRCS = glsl_parser.tab.cc glsl_lexer.cc glsl_parser_extras.cc -# ast_to_hir.cc ir.cc hir_field_selection.cc -OBJS = $(CSRCS:.c=.o) $(CCSRCS:.cc=.o) +CCSRCS = glsl_parser.tab.cpp glsl_lexer.cpp glsl_parser_extras.cpp +# ast_to_hir.cpp ir.cpp hir_field_selection.cpp +OBJS = $(CSRCS:.c=.o) $(CCSRCS:.cpp=.o) CC = gcc CXX = g++ @@ -15,26 +15,26 @@ LDLAGS = -ggdb3 glsl: $(OBJS) $(CXX) $(LDLAGS) $(OBJS) -o glsl -glsl_parser.tab.cc glsl_parser.tab.h: glsl_parser.y +glsl_parser.tab.cpp glsl_parser.tab.h: glsl_parser.y bison --report-file=glsl_parser.output -v -d \ - --output=glsl_parser.tab.cc \ + --output=glsl_parser.tab.cpp \ --name-prefix=_mesa_glsl_ $< && \ - mv glsl_parser.tab.hh glsl_parser.tab.h + mv glsl_parser.tab.hpp glsl_parser.tab.h -glsl_lexer.cc: glsl_lexer.l - flex --outfile="glsl_lexer.cc" $< +glsl_lexer.cpp: glsl_lexer.l + flex --outfile="glsl_lexer.cpp" $< -glsl_parser_tab.o: glsl_parser.tab.cc +glsl_parser_tab.o: glsl_parser.tab.cpp glsl_types.o: glsl_types.c glsl_types.h builtin_types.h -glsl_lexer.o: glsl_lexer.cc glsl_parser.tab.h glsl_parser_extras.h ast.h +glsl_lexer.o: glsl_lexer.cpp glsl_parser.tab.h glsl_parser_extras.h ast.h glsl_parser.o: glsl_parser_extras.h ast.h -ast_to_hir.o: ast_to_hir.cc symbol_table.h glsl_parser_extras.h ast.h glsl_types.h ir.h +ast_to_hir.o: ast_to_hir.cpp symbol_table.h glsl_parser_extras.h ast.h glsl_types.h ir.h builtin_types.h: builtin_types.sh ./builtin_types.sh > builtin_types.h clean: rm -f $(OBJS) glsl - rm -f glsl_lexer.cc glsl_parser.tab.{cc,h,hh} glsl_parser.output + rm -f glsl_lexer.cpp glsl_parser.tab.{cpp,h,hpp} glsl_parser.output rm -f builtin_types.h rm -f *~
\ No newline at end of file diff --git a/ast_to_hir.cc b/ast_to_hir.cpp index 8474a461ce..8474a461ce 100644 --- a/ast_to_hir.cc +++ b/ast_to_hir.cpp diff --git a/glsl_parser_extras.cc b/glsl_parser_extras.cpp index 36a6ca8264..36a6ca8264 100644 --- a/glsl_parser_extras.cc +++ b/glsl_parser_extras.cpp diff --git a/hir_field_selection.cc b/hir_field_selection.cpp index 295cbaf894..295cbaf894 100644 --- a/hir_field_selection.cc +++ b/hir_field_selection.cpp |