--- ray/src/rt/Rmakefile 2005/06/23 11:51:47 2.52 +++ ray/src/rt/Rmakefile 2015/02/24 19:39:26 2.73 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.52 2005/06/23 11:51:47 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.73 2015/02/24 19:39:26 greg Exp $ # # Compiles for ray tracing programs. # @@ -30,7 +30,7 @@ LIBDIR = /usr/local/lib/ray # RLIB = ../lib/libradiance.a RCLIB = ../lib/libraycalls.a -LIBS = -lrt $(MLIB) +LIBS = -lrtrad $(MLIB) # # Device drivers for rvu (see also devtable.c): @@ -54,11 +54,14 @@ RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC) -RLOBJS = raycalls.o raypcalls.o -RLSRC = raycalls.c raypcalls.c +RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o +RCSRC = rcmain.c rcontrib.c rc2.c rc3.c +RLOBJS = raycalls.o raypcalls.o rayfifo.o +RLSRC = raycalls.c raypcalls.c rayfifo.c + ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \ - $(MODOBJS) $(SUPPOBJS) + $(MODOBJS) $(SUPPOBJS) $(PMOBJS) RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \ $(MODSRC) $(SUPPSRC) @@ -73,9 +76,11 @@ SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \ - m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o + m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o \ + ashikhmin.o MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \ - m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c + m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c \ + ashikhmin.c MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c @@ -83,26 +88,35 @@ MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx SUPPOBJS = func.o noise3.o data.o SUPPSRC = func.c noise3.c data.c +PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \ + pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \ + pmapdiag.o pmaptype.o +PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \ + pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c \ + pmapdiag.c pmaptype.c + HEADERS = ambient.h ray.h data.h otspecial.h source.h # # What this makefile produces: # -PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb +PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \ +$(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump all: $(PROGS) $(RCLIB) $(SPECIAL) install: all rayinit.cal $(INSTALL) $(PROGS) $(INSTDIR) cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview + cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib rm -f $(LIBDIR)/rayinit.cal cp rayinit.cal $(LIBDIR) ogl: clean: - set nonomatch; rm -f $(PROGS) *.o core + set nonomatch; rm -f $(PROGS) *.o lint: $(RVSRC) $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS) @@ -111,40 +125,39 @@ lint: $(RVSRC) # Links: # -$(DESTDIR)/rtrace: $(RTOBJS) $(RLIB) - $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS) +$(DESTDIR)/rtrace: $(RTOBJS) $(RCLIB) $(RLIB) + $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS) $(DESTDIR)/rpict: $(RPOBJS) $(RLIB) $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS) -$(DESTDIR)/rvu: $(RVOBJS) $(RLIB) - $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS) +$(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB) + $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \ +$(RLIB) $(LIBS) $(DLIBS) +$(DESTDIR)/rcontrib: $(RCOBJS) $(RLIB) + $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS) + $(DESTDIR)/lookamb: lookamb.o ambio.o $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS) +$(DESTDIR)/mkpmap: mkpmap.o $(RLIB) + $(CC) $(CFLAGS) -o $(DESTDIR)/mkpmap mkpmap.o $(RLIB) $(LIBS) + +$(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o + $(CC) $(CFLAGS) -o pmapdump pmapdump.o pmaptype.o pmapparm.o $(LIBS) + $(RLIB): $(ROBJS) Version.o + rm -f $(RLIB) ar rc $(RLIB) $(ROBJS) Version.o -ranlib $(RLIB) $(RCLIB): $(RLOBJS) + rm -f $(RCLIB) ar rc $(RCLIB) $(RLOBJS) -ranlib $(RCLIB) # -# Special compiles: -# - -rtmain.o: rtmain.c - $(CC) $(CFLAGS) -DNICE=4 -c rtmain.c - -rpmain.o: rpmain.c - $(CC) $(CFLAGS) -DNICE=6 -c rpmain.c - -rvmain.o: rvmain.c - $(CC) $(CFLAGS) -c rvmain.c - -# # Uncomment the following to model dispersion: # dielectric.o: dielectric.c source.h @@ -185,23 +198,24 @@ rtrace.o rvmain.o rv2.o rv3.o: ../common/octree.h o_instance.o: ../common/instance.h -ambient.o aniso.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 \ +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 -ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \ -rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \ +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 \ srcsamp.o virtuals.o: ../common/random.h -ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \ -m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \ -mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \ -raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ +ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \ +glass.o m_bsdf.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \ +o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \ +raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \ source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \ -text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \ +text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \ +rcontrib.o rc2.o rc3.o: ray.h \ ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \ -../common/rterror.h ../common/octree.h ../common/tifftypes.h \ +../common/rterror.h ../common/octree.h \ ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h rv2.o rv3.o rview.o: rpaint.h driver.h ../common/view.h ../common/resolu.h @@ -212,7 +226,7 @@ srcobstr.o srcsamp.o srcsupp.o virtuals.o: source.h cone.o data.o devcomm.o initotypes.o fprism.o preload.o \ duphead.o octree.o: ../common/standard.h ../common/rtmisc.h \ -../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \ +../common/rtio.h ../common/rtmath.h \ ../common/rterror.h ../common/mat4.h ../common/fvect.h ambio.o: ../common/fvect.h @@ -222,6 +236,8 @@ initotypes.o srcobstr.o raytrace.o: otspecial.h rpmain.o rtmain.o rvmain.o rpict.o \ srcdraw.o: ../common/view.h ../common/resolu.h +rpict.o: ../common/hilbert.h + x11.o x11twind.o: x11twind.h x11.o: x11icon.h @@ -234,8 +250,9 @@ rv2.o: ../common/resolu.h aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \ p_func.o t_data.o t_func.o: func.h ../common/calcomp.h -preload.o: ../common/object.h ../common/face.h ../common/cone.h \ -../common/instance.h ../common/mesh.h ../common/color.h data.h +preload.o: data.h func.h ../common/object.h ../common/face.h \ +../common/cone.h ../common/instance.h ../common/mesh.h \ +../common/color.h ../common/bsdf.h ../common/otypes.h rtmain.o rpmain.o rvmain.o persist.o duphead.o \ renderopts.o rpict.o: ../common/paths.h @@ -248,8 +265,141 @@ o_mesh.o: ../common/mesh.h noise3.o: ../common/calcomp.h -aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \ +aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o initotypes.o \ m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \ mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \ o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \ -text.o: rtotypes.h +srcobstr.o text.o: rtotypes.h + +m_bsdf.o: ambient.h source.h func.h \ +../common/calcomp.h ../common/bsdf.h ../common/random.h + +rcmain.o rcontrib.o rc2.o rc3.o: rcontrib.h \ +../common/platform.h ../common/paths.h ../common/lookup.h \ +func.h ../common/calcomp.h ../common/rtprocess.h + +rcmain.o: source.h ambient.h + +rcontrib.o: source.h ../common/otypes.h + +rc2.o: ../common/resolu.h + +rc3.o: ../common/selcall.h + +# +# Photon map include dependencies (via 'gcc -MM -I../common') +# + + +ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h + +aniso.o dielectric.o glass.o m_mirror.o normal.o: \ + pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h + +raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \ + pmapparm.h pmaptype.h pmapray.h + +rcmain.o: pmapparm.h pmaptype.h pmapray.h pmapcontrib.h pmapdata.h + +raytrace.o: pmapparm.h pmaptype.h pmap.h pmapdata.h + +renderopts.o: pmapparm.h pmaptype.h pmapopt.h + +rpict.o: pmapparm.h pmaptype.h pmapbias.h pmapdata.h pmapdiag.h + +source.o: pmapparm.h pmaptype.h pmap.h pmapdata.h pmapsrc.h + +pmapamb.o: pmapamb.c pmapamb.h pmapdata.h ray.h ../common/standard.h \ + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \ + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \ + ../common/rterror.h ../common/octree.h ../common/object.h \ + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h + +pmapbias.o: pmapbias.c pmapbias.h pmapdata.h ray.h ../common/standard.h \ + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \ + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \ + ../common/rterror.h ../common/octree.h ../common/object.h \ + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmap.h \ + pmaprand.h + +pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \ + ../common/standard.h ../common/copyright.h ../common/rtio.h \ + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ + ../common/fvect.h ../common/rterror.h ../common/octree.h \ + ../common/object.h ../common/color.h ../common/lookup.h pmapmat.h \ + pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \ + ../common/platform.h ../common/otypes.h + +pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \ + ../common/standard.h ../common/copyright.h ../common/rtio.h \ + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ + ../common/fvect.h ../common/rterror.h ../common/octree.h \ + ../common/object.h ../common/color.h pmapparm.h pmaptype.h \ + ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \ + pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \ + ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \ + ../common/otypes.h + +pmapdata.o: pmapdata.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \ + ../common/standard.h ../common/copyright.h ../common/rtio.h \ + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ + ../common/fvect.h ../common/rterror.h ../common/octree.h \ + ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \ + pmapmat.h ../common/otypes.h source.h rcontrib.h ../common/platform.h \ + ../common/paths.h ../common/rtprocess.h ../common/paths.h func.h \ + ../common/calcomp.h + +pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \ + ../common/standard.h ../common/copyright.h ../common/rtio.h \ + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ + ../common/fvect.h ../common/rterror.h ../common/octree.h \ + ../common/object.h ../common/color.h pmapparm.h pmaptype.h \ + ../common/lookup.h + +pmapdump.o: pmapdump.c pmapio.h pmapdata.h ray.h ../common/standard.h \ + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \ + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \ + ../common/rterror.h ../common/octree.h ../common/object.h \ + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h \ + ../common/rtio.h ../common/resolu.h + +pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common/standard.h \ + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \ + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \ + ../common/rterror.h ../common/octree.h ../common/object.h \ + ../common/color.h pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \ + ../common/platform.h ../common/resolu.h + +pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \ + ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \ + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ + ../common/fvect.h ../common/rterror.h ../common/octree.h \ + ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \ + ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \ + ../common/ccolor.h + +pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \ + ../common/rterror.h + +pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.h ray.h \ + ../common/standard.h ../common/copyright.h ../common/rtio.h \ + ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \ + ../common/fvect.h ../common/rterror.h ../common/octree.h \ + ../common/object.h ../common/color.h ../common/lookup.h + +pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \ + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \ + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \ + ../common/rterror.h ../common/octree.h ../common/object.h \ + ../common/color.h pmapparm.h pmaptype.h pmap.h pmapdata.h \ + ../common/lookup.h + +pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standard.h \ + ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \ + ../common/rtmath.h ../common/tiff.h ../common/mat4.h ../common/fvect.h \ + ../common/rterror.h ../common/octree.h ../common/object.h \ + ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \ + ../common/lookup.h pmaprand.h ../common/otypes.h + +pmaptype.o: pmaptype.c pmaptype.h +