diff options
| author | Jakob Bornecrantz <[email protected]> | 2009-07-03 18:53:58 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2009-07-03 18:53:58 +0200 |
| commit | 862488075c5537b0613753b0d14c267527fc6199 (patch) | |
| tree | fd4d51272c86fbc88c12e2d16649547f3ca7b8df /progs/trivial/Makefile | |
| parent | 060c7f2321f72503c14f9f3f7bb27d59d8a90224 (diff) | |
| parent | 94e1117c9ba259665cd8e790369dcd4c789a2f93 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/dlist.c
src/mesa/vbo/vbo_save_api.c
Diffstat (limited to 'progs/trivial/Makefile')
| -rw-r--r-- | progs/trivial/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile index 22de83fa790..3bd8faff99a 100644 --- a/progs/trivial/Makefile +++ b/progs/trivial/Makefile @@ -19,6 +19,12 @@ SOURCES = \ clear-random.c \ clear.c \ dlist-dangling.c \ + dlist-flat-tri.c \ + dlist-mat-tri.c \ + dlist-tri-flat-tri.c \ + dlist-tri-mat-tri.c \ + dlist-recursive-call.c \ + dlist-begin-call-end.c \ dlist-edgeflag-dangling.c \ dlist-edgeflag.c \ dlist-degenerate.c \ @@ -105,6 +111,7 @@ SOURCES = \ tri-fp.c \ tri-fp-const-imm.c \ tri-lit.c \ + tri-lit-material.c \ tri-mask-tri.c \ tri-orig.c \ tri-query.c \ |