| 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 | 
> | 
        ashikhmin.o | 
| 81 | 
  | 
MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \ | 
| 82 | 
< | 
        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c | 
| 82 | 
> | 
        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c \ | 
| 83 | 
> | 
        ashikhmin.c | 
| 84 | 
  | 
 | 
| 85 | 
  | 
MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o | 
| 86 | 
  | 
MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c | 
| 94 | 
  | 
# What this makefile produces: | 
| 95 | 
  | 
# | 
| 96 | 
  | 
 | 
| 97 | 
< | 
PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb | 
| 97 | 
> | 
PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \ | 
| 98 | 
> | 
$(DESTDIR)/lookamb | 
| 99 | 
  | 
 | 
| 100 | 
  | 
all:    $(PROGS) $(RCLIB) $(SPECIAL) | 
| 101 | 
  | 
 | 
| 102 | 
  | 
install:        all rayinit.cal | 
| 103 | 
  | 
        $(INSTALL) $(PROGS) $(INSTDIR) | 
| 104 | 
  | 
        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview | 
| 105 | 
+ | 
        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib | 
| 106 | 
  | 
        rm -f $(LIBDIR)/rayinit.cal | 
| 107 | 
  | 
        cp rayinit.cal $(LIBDIR) | 
| 108 | 
  | 
 | 
| 118 | 
  | 
# Links: | 
| 119 | 
  | 
# | 
| 120 | 
  | 
 | 
| 121 | 
< | 
$(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB) | 
| 122 | 
< | 
        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS) | 
| 121 | 
> | 
$(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB) | 
| 122 | 
> | 
        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS) | 
| 123 | 
  | 
 | 
| 124 | 
  | 
$(DESTDIR)/rpict:       $(RPOBJS) $(RLIB) | 
| 125 | 
  | 
        $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS) | 
| 126 | 
  | 
 | 
| 127 | 
< | 
$(DESTDIR)/rvu: $(RVOBJS) $(RLIB) | 
| 128 | 
< | 
        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS) | 
| 127 | 
> | 
$(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB) | 
| 128 | 
> | 
        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \ | 
| 129 | 
> | 
$(RLIB) $(LIBS) $(DLIBS) | 
| 130 | 
  | 
 | 
| 131 | 
+ | 
$(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB) | 
| 132 | 
+ | 
        $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS) | 
| 133 | 
+ | 
 | 
| 134 | 
  | 
$(DESTDIR)/lookamb:     lookamb.o ambio.o | 
| 135 | 
  | 
        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS) | 
| 136 | 
  | 
 | 
| 137 | 
  | 
$(RLIB):        $(ROBJS) Version.o | 
| 138 | 
+ | 
        rm -f $(RLIB) | 
| 139 | 
  | 
        ar rc $(RLIB) $(ROBJS) Version.o | 
| 140 | 
  | 
        -ranlib $(RLIB) | 
| 141 | 
  | 
 | 
| 142 | 
  | 
$(RCLIB):       $(RLOBJS) | 
| 143 | 
+ | 
        rm -f $(RCLIB) | 
| 144 | 
  | 
        ar rc $(RCLIB) $(RLOBJS) | 
| 145 | 
  | 
        -ranlib $(RCLIB) | 
| 146 | 
  | 
 | 
| 185 | 
  | 
 | 
| 186 | 
  | 
o_instance.o:   ../common/instance.h | 
| 187 | 
  | 
 | 
| 188 | 
< | 
ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \ | 
| 189 | 
< | 
m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \ | 
| 188 | 
> | 
ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \ | 
| 189 | 
> | 
initotypes.o m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \ | 
| 190 | 
  | 
raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \ | 
| 191 | 
  | 
srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h | 
| 192 | 
  | 
 | 
| 193 | 
< | 
ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \ | 
| 194 | 
< | 
rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \ | 
| 193 | 
> | 
ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \ | 
| 194 | 
> | 
rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \ | 
| 195 | 
  | 
srcsamp.o virtuals.o:   ../common/random.h | 
| 196 | 
  | 
 | 
| 197 | 
< | 
ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \ | 
| 198 | 
< | 
m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \ | 
| 199 | 
< | 
mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \ | 
| 200 | 
< | 
raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ | 
| 197 | 
> | 
ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \ | 
| 198 | 
> | 
glass.o m_bsdf.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \ | 
| 199 | 
> | 
o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \ | 
| 200 | 
> | 
raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ | 
| 201 | 
  | 
source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \ | 
| 202 | 
< | 
text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \ | 
| 202 | 
> | 
text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \ | 
| 203 | 
> | 
rcontrib.o rc2.o rc3.o: ray.h \ | 
| 204 | 
  | 
../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \ | 
| 205 | 
< | 
../common/rterror.h ../common/octree.h ../common/tifftypes.h \ | 
| 205 | 
> | 
../common/rterror.h ../common/octree.h \ | 
| 206 | 
  | 
../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h | 
| 207 | 
  | 
 | 
| 208 | 
  | 
rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h | 
| 213 | 
  | 
 | 
| 214 | 
  | 
cone.o data.o devcomm.o initotypes.o fprism.o preload.o \ | 
| 215 | 
  | 
duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \ | 
| 216 | 
< | 
../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \ | 
| 216 | 
> | 
../common/rtio.h ../common/rtmath.h \ | 
| 217 | 
  | 
../common/rterror.h ../common/mat4.h ../common/fvect.h | 
| 218 | 
  | 
 | 
| 219 | 
  | 
ambio.o:        ../common/fvect.h | 
| 223 | 
  | 
rpmain.o rtmain.o rvmain.o rpict.o \ | 
| 224 | 
  | 
srcdraw.o:      ../common/view.h ../common/resolu.h | 
| 225 | 
  | 
 | 
| 226 | 
+ | 
rpict.o:        ../common/hilbert.h | 
| 227 | 
+ | 
 | 
| 228 | 
  | 
x11.o x11twind.o: x11twind.h | 
| 229 | 
  | 
 | 
| 230 | 
  | 
x11.o:  x11icon.h | 
| 237 | 
  | 
aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \ | 
| 238 | 
  | 
p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h | 
| 239 | 
  | 
 | 
| 240 | 
< | 
preload.o:      ../common/object.h ../common/face.h ../common/cone.h \ | 
| 241 | 
< | 
../common/instance.h ../common/mesh.h ../common/color.h data.h | 
| 240 | 
> | 
preload.o:      data.h func.h ../common/object.h ../common/face.h \ | 
| 241 | 
> | 
../common/cone.h ../common/instance.h ../common/mesh.h \ | 
| 242 | 
> | 
../common/color.h ../common/bsdf.h ../common/otypes.h | 
| 243 | 
  | 
 | 
| 244 | 
  | 
rtmain.o rpmain.o rvmain.o persist.o duphead.o \ | 
| 245 | 
  | 
renderopts.o rpict.o:   ../common/paths.h | 
| 252 | 
  | 
 | 
| 253 | 
  | 
noise3.o:       ../common/calcomp.h | 
| 254 | 
  | 
 | 
| 255 | 
< | 
aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \ | 
| 255 | 
> | 
aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o initotypes.o \ | 
| 256 | 
  | 
m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \ | 
| 257 | 
  | 
mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \ | 
| 258 | 
  | 
o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \ | 
| 259 | 
< | 
text.o:         rtotypes.h | 
| 259 | 
> | 
srcobstr.o text.o:              rtotypes.h | 
| 260 | 
> | 
 | 
| 261 | 
> | 
m_bsdf.o:       ambient.h source.h func.h \ | 
| 262 | 
> | 
../common/calcomp.h ../common/bsdf.h ../common/random.h | 
| 263 | 
> | 
 | 
| 264 | 
> | 
rcmain.o rcontrib.o rc2.o rc3.o:        rcontrib.h \ | 
| 265 | 
> | 
../common/platform.h ../common/paths.h ../common/lookup.h \ | 
| 266 | 
> | 
func.h ../common/calcomp.h ../common/rtprocess.h | 
| 267 | 
> | 
 | 
| 268 | 
> | 
rcmain.o:       source.h ambient.h | 
| 269 | 
> | 
 | 
| 270 | 
> | 
rcontrib.o:     source.h ../common/otypes.h | 
| 271 | 
> | 
 | 
| 272 | 
> | 
rc2.o:  ../common/resolu.h | 
| 273 | 
> | 
 | 
| 274 | 
> | 
rc3.o:  ../common/selcall.h |