--- ray/src/ot/Rmakefile 2003/06/27 06:53:22 2.12 +++ ray/src/ot/Rmakefile 2006/03/10 19:40:13 2.16 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.12 2003/06/27 06:53:22 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.16 2006/03/10 19:40:13 schorsch Exp $ # # Compiles for octree conversion program # @@ -25,15 +25,15 @@ oconv: oconv.o sphere.o writeoct.o o_face.o \ o_cone.o o_instance.o bbox.o initotypes.o $(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \ o_cone.o o_instance.o bbox.o \ -initotypes.o -lrt $(MLIB) +initotypes.o -lrtrad $(MLIB) getbbox: getbbox.o readobj2.o bbox.o init2otypes.o $(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \ -bbox.o init2otypes.o -lrt $(MLIB) +bbox.o init2otypes.o -lrtrad $(MLIB) obj2mesh: obj2mesh.o cvmesh.o wfconv.o o_face.o writemesh.o $(CC) $(CFLAGS) -o obj2mesh obj2mesh.o cvmesh.o wfconv.o \ -o_face.o writemesh.o -lrt $(MLIB) +o_face.o writemesh.o -lrtrad $(MLIB) install: $(PROGS) cp $(PROGS) $(INSTDIR) @@ -46,7 +46,7 @@ o_instance.o oconv.o sphere.o \ cvmesh.o obj2mesh.o wfconv.o \ writeoct.o: ../common/standard.h ../common/rtmisc.h ../common/rtio.h \ ../common/rtmath.h ../common/mat4.h ../common/fvect.h \ -../common/rterror.h +../common/rterror.h ../common/tifftypes.h initotypes.o o_cone.o o_face.o oconv.o \ sphere.o writeoct.o: ../common/octree.h @@ -56,6 +56,8 @@ sphere.o writeoct.o: ../common/object.h bbox.o initotypes.o oconv.o obj2mesh.o sphere.o: ../common/otypes.h +bbox.o getbbox.o initotypes.o oconv.o readobj2.o writeoct.o: oconv.h + oconv.o: ../common/paths.h bbox.o o_cone.o: ../common/cone.h @@ -74,4 +76,4 @@ initotypes.o init2otypes.o: ../common/otypes.h cvmesh.o obj2mesh.o wfconv.o: cvmesh.h \ ../common/octree.h ../common/object.h ../common/mesh.h -cvmesh.o: ../common/otypes.h ../common/face.h +cvmesh.o: ../common/otypes.h ../common/face.h ../common/tmesh.h