| 6 |  | OPT = -O | 
| 7 |  | MACH = -DBSD | 
| 8 |  | CFLAGS = -I../common -L../lib $(OPT) $(MACH) | 
| 9 | < | SPECIAL = aed | 
| 9 | > | SPECIAL = | 
| 10 |  | CC = cc | 
| 11 |  | MLIB = -lm | 
| 12 |  | LINT = lint | 
| 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 | > | RLOBJS = raycalls.o raypcalls.o rayfifo.o | 
| 58 | > | RLSRC = raycalls.c raypcalls.c rayfifo.c | 
| 59 |  |  | 
| 60 |  | ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \ | 
| 61 |  | $(MODOBJS) $(SUPPOBJS) | 
| 99 |  | rm -f $(LIBDIR)/rayinit.cal | 
| 100 |  | cp rayinit.cal $(LIBDIR) | 
| 101 |  |  | 
| 102 | – | aed:    $(DEVDIR)/aed | 
| 103 | – |  | 
| 102 |  | ogl: | 
| 103 |  |  | 
| 104 |  | clean: | 
| 117 |  | $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB) | 
| 118 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS) | 
| 119 |  |  | 
| 120 | < | $(DESTDIR)/rvu: $(RVOBJS) $(RLIB) | 
| 121 | < | $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS) | 
| 120 | > | $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB) | 
| 121 | > | $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \ | 
| 122 | > | $(RLIB) $(LIBS) $(DLIBS) | 
| 123 |  |  | 
| 124 |  | $(DESTDIR)/lookamb:     lookamb.o ambio.o | 
| 125 |  | $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS) | 
| 126 |  |  | 
| 128 | – | $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o | 
| 129 | – | $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \ | 
| 130 | – | devmain.o tty.o editline.o $(LIBS) | 
| 131 | – |  | 
| 127 |  | $(RLIB):        $(ROBJS) Version.o | 
| 128 |  | ar rc $(RLIB) $(ROBJS) Version.o | 
| 129 |  | -ranlib $(RLIB) | 
| 133 |  | -ranlib $(RCLIB) | 
| 134 |  |  | 
| 135 |  | # | 
| 141 | – | # Special compiles: | 
| 142 | – | # | 
| 143 | – |  | 
| 144 | – | rtmain.o:       rtmain.c | 
| 145 | – | $(CC) $(CFLAGS) -DNICE=4 -c rtmain.c | 
| 146 | – |  | 
| 147 | – | rpmain.o:       rpmain.c | 
| 148 | – | $(CC) $(CFLAGS) -DNICE=6 -c rpmain.c | 
| 149 | – |  | 
| 150 | – | rvmain.o:       rvmain.c | 
| 151 | – | $(CC) $(CFLAGS) -c rvmain.c | 
| 152 | – |  | 
| 153 | – | # | 
| 136 |  | # Uncomment the following to model dispersion: | 
| 137 |  | # | 
| 138 |  | dielectric.o:   dielectric.c source.h | 
| 143 |  | devcomm.o:      devcomm.c | 
| 144 |  | $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c | 
| 145 |  |  | 
| 164 | – | aed.o:  aed.c | 
| 165 | – | $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c | 
| 166 | – |  | 
| 146 |  | # | 
| 147 |  | # Version module: | 
| 148 |  | # | 
| 155 |  | # Include dependencies: | 
| 156 |  | # | 
| 157 |  |  | 
| 158 | < | aed.o ambio.o colortab.o data.o devcomm.o \ | 
| 158 | > | ambio.o colortab.o data.o devcomm.o \ | 
| 159 |  | devmain.o lookamb.o rview.o x11.o:      ../common/color.h | 
| 160 |  |  | 
| 161 |  | freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h | 
| 163 |  | data.o freeobjmem.o m_brdf.o mx_data.o \ | 
| 164 |  | p_data.o raycalls.o t_data.o:   data.h | 
| 165 |  |  | 
| 166 | < | aed.o devcomm.o devmain.o devtable.o \ | 
| 167 | < | editline.o tty.o x11.o: driver.h | 
| 166 | > | devcomm.o devmain.o devtable.o \ | 
| 167 | > | editline.o x11.o:       driver.h | 
| 168 |  |  | 
| 169 |  | freeobjmem.o o_face.o srcsupp.o:        ../common/face.h | 
| 170 |  |  | 
| 178 |  | raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \ | 
| 179 |  | srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h | 
| 180 |  |  | 
| 181 | < | ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \ | 
| 182 | < | rtmain.o rpmain.o persist.o source.o rv3.o \ | 
| 181 | > | ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \ | 
| 182 | > | rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \ | 
| 183 |  | srcsamp.o virtuals.o:   ../common/random.h | 
| 184 |  |  | 
| 185 |  | ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \ | 
| 186 |  | m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \ | 
| 187 |  | mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \ | 
| 188 | < | raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ | 
| 188 | > | raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ | 
| 189 |  | source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \ | 
| 190 |  | text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \ | 
| 191 |  | ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \ | 
| 192 | < | ../common/rterror.h ../common/octree.h ../common/tifftypes.h \ | 
| 192 | > | ../common/rterror.h ../common/octree.h \ | 
| 193 |  | ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h | 
| 194 |  |  | 
| 195 |  | rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h | 
| 196 |  |  | 
| 197 |  | m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \ | 
| 198 | < | rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \ | 
| 198 | > | rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \ | 
| 199 |  | srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h | 
| 200 |  |  | 
| 201 |  | cone.o data.o devcomm.o initotypes.o fprism.o preload.o \ | 
| 202 |  | duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \ | 
| 203 | < | ../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \ | 
| 203 | > | ../common/rtio.h ../common/rtmath.h \ | 
| 204 |  | ../common/rterror.h ../common/mat4.h ../common/fvect.h | 
| 205 |  |  | 
| 206 |  | ambio.o:        ../common/fvect.h | 
| 235 |  | o_mesh.o:       ../common/mesh.h | 
| 236 |  |  | 
| 237 |  | noise3.o:       ../common/calcomp.h | 
| 238 | + |  | 
| 239 | + | aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \ | 
| 240 | + | m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \ | 
| 241 | + | mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \ | 
| 242 | + | o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \ | 
| 243 | + | srcobstr.o text.o:              rtotypes.h |