--- ray/src/rt/Rmakefile 2018/01/09 05:01:15 2.81 +++ ray/src/rt/Rmakefile 2018/11/07 18:34:58 2.84 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.81 2018/01/09 05:01:15 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.84 2018/11/07 18:34:58 greg Exp $ # # Compiles for ray tracing programs. # @@ -8,6 +8,7 @@ MACH = -DBSD CFLAGS = -I../common -L../lib $(OPT) $(MACH) SPECIAL = CC = cc +AR = ar MLIB = -lm LINT = lint LINTFLAGS = -DBSD @@ -151,12 +152,12 @@ $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o $(RLIB): $(ROBJS) Version.o rm -f $(RLIB) - ar rc $(RLIB) $(ROBJS) Version.o + $(AR) rc $(RLIB) $(ROBJS) Version.o -ranlib $(RLIB) $(RCLIB): $(RLOBJS) rm -f $(RCLIB) - ar rc $(RCLIB) $(RLOBJS) + $(AR) rc $(RCLIB) $(RLOBJS) -ranlib $(RCLIB) # @@ -201,9 +202,9 @@ rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h o_instance.o: ../common/instance.h ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \ -initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \ -raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \ -srcdraw.o srcobstr.o virtuals.o: ../common/otypes.h +initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \ +preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \ +srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o: ../common/otypes.h ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \ rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \ @@ -233,7 +234,7 @@ duphead.o octree.o: ../common/standard.h ../common/rtm ambio.o: ../common/fvect.h -ambient.o initotypes.o srcobstr.o raytrace.o: otspecial.h +ambient.o initotypes.o srcobstr.o raytrace.o rv3.o: otspecial.h rpmain.o rtmain.o rvmain.o rpict.o \ srcdraw.o: ../common/view.h ../common/resolu.h @@ -282,7 +283,7 @@ func.h ../common/calcomp.h ../common/rtprocess.h ambient.o rcmain.o: source.h ambient.h -rcontrib.o: source.h ../common/otypes.h +rcontrib.o rv3.o: source.h ../common/otypes.h rc2.o: ../common/resolu.h