| 30 |  | # | 
| 31 |  | RLIB = ../lib/libradiance.a | 
| 32 |  | RCLIB = ../lib/libraycalls.a | 
| 33 | < | LIBS = -lrt $(MLIB) | 
| 33 | > | LIBS = -lrtrad $(MLIB) | 
| 34 |  |  | 
| 35 |  | # | 
| 36 |  | # Device drivers for rvu (see also devtable.c): | 
| 54 |  | RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) | 
| 55 |  | RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC) | 
| 56 |  |  | 
| 57 | < | RLOBJS = raycalls.o raypcalls.o | 
| 58 | < | RLSRC = raycalls.c raypcalls.c | 
| 57 | > | RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o | 
| 58 | > | RCSRC = rcmain.c rcontrib.c rc2.c rc3.c | 
| 59 |  |  | 
| 60 | + | RLOBJS = raycalls.o raypcalls.o rayfifo.o | 
| 61 | + | RLSRC = raycalls.c raypcalls.c rayfifo.c | 
| 62 | + |  | 
| 63 |  | ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \ | 
| 64 |  | $(MODOBJS) $(SUPPOBJS) | 
| 65 |  | RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \ | 
| 76 |  | o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c | 
| 77 |  |  | 
| 78 |  | MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \ | 
| 79 | < | m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o | 
| 79 | > | m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o | 
| 80 |  | MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \ | 
| 81 | < | m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c | 
| 81 | > | m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c | 
| 82 |  |  | 
| 83 |  | MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o | 
| 84 |  | MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c | 
| 92 |  | # What this makefile produces: | 
| 93 |  | # | 
| 94 |  |  | 
| 95 | < | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb | 
| 95 | > | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \ | 
| 96 | > | $(DESTDIR)/lookamb | 
| 97 |  |  | 
| 98 |  | all:    $(PROGS) $(RCLIB) $(SPECIAL) | 
| 99 |  |  | 
| 115 |  | # Links: | 
| 116 |  | # | 
| 117 |  |  | 
| 118 | < | $(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB) | 
| 119 | < | $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS) | 
| 118 | > | $(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB) | 
| 119 | > | $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS) | 
| 120 |  |  | 
| 121 |  | $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB) | 
| 122 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS) | 
| 123 |  |  | 
| 124 | < | $(DESTDIR)/rvu: $(RVOBJS) $(RLIB) | 
| 125 | < | $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS) | 
| 124 | > | $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB) | 
| 125 | > | $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \ | 
| 126 | > | $(RLIB) $(LIBS) $(DLIBS) | 
| 127 |  |  | 
| 128 | + | $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB) | 
| 129 | + | $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS) | 
| 130 | + |  | 
| 131 |  | $(DESTDIR)/lookamb:     lookamb.o ambio.o | 
| 132 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS) | 
| 133 |  |  | 
| 134 |  | $(RLIB):        $(ROBJS) Version.o | 
| 135 | + | rm -f $(RLIB) | 
| 136 |  | ar rc $(RLIB) $(ROBJS) Version.o | 
| 137 |  | -ranlib $(RLIB) | 
| 138 |  |  | 
| 139 |  | $(RCLIB):       $(RLOBJS) | 
| 140 | + | rm -f $(RCLIB) | 
| 141 |  | ar rc $(RCLIB) $(RLOBJS) | 
| 142 |  | -ranlib $(RCLIB) | 
| 143 |  |  | 
| 144 |  | # | 
| 135 | – | # Special compiles: | 
| 136 | – | # | 
| 137 | – |  | 
| 138 | – | rtmain.o:       rtmain.c | 
| 139 | – | $(CC) $(CFLAGS) -DNICE=4 -c rtmain.c | 
| 140 | – |  | 
| 141 | – | rpmain.o:       rpmain.c | 
| 142 | – | $(CC) $(CFLAGS) -DNICE=6 -c rpmain.c | 
| 143 | – |  | 
| 144 | – | rvmain.o:       rvmain.c | 
| 145 | – | $(CC) $(CFLAGS) -c rvmain.c | 
| 146 | – |  | 
| 147 | – | # | 
| 145 |  | # Uncomment the following to model dispersion: | 
| 146 |  | # | 
| 147 |  | dielectric.o:   dielectric.c source.h | 
| 187 |  | raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \ | 
| 188 |  | srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h | 
| 189 |  |  | 
| 190 | < | ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \ | 
| 191 | < | rtmain.o rpmain.o persist.o source.o rv3.o \ | 
| 190 | > | ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \ | 
| 191 | > | rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \ | 
| 192 |  | srcsamp.o virtuals.o:   ../common/random.h | 
| 193 |  |  | 
| 194 | < | ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \ | 
| 194 | > | ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.o \ | 
| 195 |  | m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \ | 
| 196 |  | mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \ | 
| 197 | < | raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ | 
| 197 | > | raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ | 
| 198 |  | source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \ | 
| 199 |  | text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \ | 
| 200 |  | ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \ | 
| 201 | < | ../common/rterror.h ../common/octree.h ../common/tifftypes.h \ | 
| 201 | > | ../common/rterror.h ../common/octree.h \ | 
| 202 |  | ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h | 
| 203 |  |  | 
| 204 |  | rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h | 
| 205 |  |  | 
| 206 |  | m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \ | 
| 207 | < | rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \ | 
| 207 | > | rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \ | 
| 208 |  | srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h | 
| 209 |  |  | 
| 210 |  | cone.o data.o devcomm.o initotypes.o fprism.o preload.o \ | 
| 211 |  | duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \ | 
| 212 | < | ../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \ | 
| 212 | > | ../common/rtio.h ../common/rtmath.h \ | 
| 213 |  | ../common/rterror.h ../common/mat4.h ../common/fvect.h | 
| 214 |  |  | 
| 215 |  | ambio.o:        ../common/fvect.h | 
| 231 |  | aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \ | 
| 232 |  | p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h | 
| 233 |  |  | 
| 234 | < | preload.o:      ../common/object.h ../common/face.h ../common/cone.h \ | 
| 235 | < | ../common/instance.h ../common/mesh.h ../common/color.h data.h | 
| 234 | > | preload.o:      data.h func.h ../common/object.h ../common/face.h \ | 
| 235 | > | ../common/cone.h ../common/instance.h ../common/mesh.h \ | 
| 236 | > | ../common/color.h ../common/bsdf.h ../common/otypes.h | 
| 237 |  |  | 
| 238 |  | rtmain.o rpmain.o rvmain.o persist.o duphead.o \ | 
| 239 |  | renderopts.o rpict.o:   ../common/paths.h | 
| 245 |  | o_mesh.o:       ../common/mesh.h | 
| 246 |  |  | 
| 247 |  | noise3.o:       ../common/calcomp.h | 
| 248 | + |  | 
| 249 | + | aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \ | 
| 250 | + | m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \ | 
| 251 | + | mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \ | 
| 252 | + | o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \ | 
| 253 | + | srcobstr.o text.o:              rtotypes.h | 
| 254 | + |  | 
| 255 | + | m_bsdf.o:       ambient.h source.h func.h \ | 
| 256 | + | ../common/calcomp.h ../common/bsdf.h ../common/random.h |