diff options
| author | ldelgass <ldelgass> | 2003-03-30 04:49:52 +0000 |
|---|---|---|
| committer | ldelgass <ldelgass> | 2003-03-30 04:49:52 +0000 |
| commit | b8c3a04c9a0316029234e9f6d23bd41fc3d6b21f (patch) | |
| tree | 04302240ba49af242bd168881e18855a8a1b863a /xc/lib/GL/mesa/src/tnl/Imakefile.inc | |
| parent | ebce8f934a8bb868f6d390ec3b35a3dc2ae18c0b (diff) | |
Merge trunk - 4.3.0, filpmach64-0-0-6-20030330
Diffstat (limited to 'xc/lib/GL/mesa/src/tnl/Imakefile.inc')
| -rw-r--r-- | xc/lib/GL/mesa/src/tnl/Imakefile.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xc/lib/GL/mesa/src/tnl/Imakefile.inc b/xc/lib/GL/mesa/src/tnl/Imakefile.inc index 87b6dafcf..e2c8a2341 100644 --- a/xc/lib/GL/mesa/src/tnl/Imakefile.inc +++ b/xc/lib/GL/mesa/src/tnl/Imakefile.inc @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1 2002/02/23 00:45:53 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.2 2002/11/14 21:01:17 tsi Exp $ #ifndef MesaTnlBuildDir #define MesaTnlBuildDir $(GLXLIBSRC)/mesa/src/tnl/ @@ -23,6 +23,7 @@ MESATNLBUILDDIR = MesaTnlBuildDir $(MESATNLBUILDDIR)t_vb_light.c \ $(MESATNLBUILDDIR)t_vb_normals.c \ $(MESATNLBUILDDIR)t_vb_points.c \ + $(MESATNLBUILDDIR)t_vb_program.c \ $(MESATNLBUILDDIR)t_vb_render.c \ $(MESATNLBUILDDIR)t_vb_texgen.c \ $(MESATNLBUILDDIR)t_vb_texmat.c \ @@ -46,6 +47,7 @@ LinkSourceFile(t_vb_fog.c, $(MESASRCDIR)/src/tnl) LinkSourceFile(t_vb_light.c, $(MESASRCDIR)/src/tnl) LinkSourceFile(t_vb_normals.c, $(MESASRCDIR)/src/tnl) LinkSourceFile(t_vb_points.c, $(MESASRCDIR)/src/tnl) +LinkSourceFile(t_vb_program.c, $(MESASRCDIR)/src/tnl) LinkSourceFile(t_vb_render.c, $(MESASRCDIR)/src/tnl) LinkSourceFile(t_vb_texgen.c, $(MESASRCDIR)/src/tnl) LinkSourceFile(t_vb_texmat.c, $(MESASRCDIR)/src/tnl) @@ -69,12 +71,13 @@ LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/tnl) $(MESATNLBUILDDIR)t_vb_light.o \ $(MESATNLBUILDDIR)t_vb_normals.o \ $(MESATNLBUILDDIR)t_vb_points.o \ + $(MESATNLBUILDDIR)t_vb_program.o \ $(MESATNLBUILDDIR)t_vb_render.o \ $(MESATNLBUILDDIR)t_vb_texgen.o \ $(MESATNLBUILDDIR)t_vb_texmat.o \ $(MESATNLBUILDDIR)t_vb_vertex.o -#if DoSharedLib +#if defined(DoSharedLib) && DoSharedLib MESA_TNL_UOBJS = $(MESATNLBUILDDIR)unshared/t_array_api.o \ $(MESATNLBUILDDIR)unshared/t_array_import.o \ $(MESATNLBUILDDIR)unshared/t_context.o \ @@ -92,6 +95,7 @@ LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/tnl) $(MESATNLBUILDDIR)unshared/t_vb_light.o \ $(MESATNLBUILDDIR)unshared/t_vb_normals.o \ $(MESATNLBUILDDIR)unshared/t_vb_points.o \ + $(MESATNLBUILDDIR)unshared/t_vb_program.o \ $(MESATNLBUILDDIR)unshared/t_vb_render.o \ $(MESATNLBUILDDIR)unshared/t_vb_texgen.o \ $(MESATNLBUILDDIR)unshared/t_vb_texmat.o \ @@ -117,6 +121,7 @@ LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/tnl) $(MESATNLBUILDDIR)debugger/t_vb_light.o \ $(MESATNLBUILDDIR)debugger/t_vb_normals.o \ $(MESATNLBUILDDIR)debugger/t_vb_points.o \ + $(MESATNLBUILDDIR)debugger/t_vb_program.o \ $(MESATNLBUILDDIR)debugger/t_vb_render.o \ $(MESATNLBUILDDIR)debugger/t_vb_texgen.o \ $(MESATNLBUILDDIR)debugger/t_vb_texmat.o \ @@ -139,6 +144,7 @@ LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/tnl) $(MESATNLBUILDDIR)profiled/t_vb_light.o \ $(MESATNLBUILDDIR)profiled/t_vb_normals.o \ $(MESATNLBUILDDIR)profiled/t_vb_points.o \ + $(MESATNLBUILDDIR)profiled/t_vb_program.o \ $(MESATNLBUILDDIR)profiled/t_vb_render.o \ $(MESATNLBUILDDIR)profiled/t_vb_texgen.o \ $(MESATNLBUILDDIR)profiled/t_vb_texmat.o \ |