--- ray/src/rt/Rmakefile 2003/06/06 18:38:19 2.36 +++ ray/src/rt/Rmakefile 2005/04/14 04:42:32 2.50 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.36 2003/06/06 18:38:19 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.50 2005/04/14 04:42:32 greg Exp $ # # Compiles for ray tracing programs. # @@ -6,7 +6,7 @@ OPT = -O MACH = -DBSD CFLAGS = -I../common -L../lib $(OPT) $(MACH) -SPECIAL = aed +SPECIAL = CC = cc MLIB = -lm LINT = lint @@ -29,11 +29,11 @@ LIBDIR = /usr/local/lib/ray # Library routines: # RLIB = ../lib/libradiance.a -RCLIB = libraycalls.a +RCLIB = ../lib/libraycalls.a LIBS = -lrt $(MLIB) # -# Device drivers for rview (see also devtable.c): +# Device drivers for rvu (see also devtable.c): # DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \ colortab.o @@ -67,10 +67,10 @@ RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o ini RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c initotypes.c \ preload.c raytrace.c renderopts.c -SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \ - o_cone.o o_instance.o o_mesh.o -SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \ - srcsamp.c o_cone.c o_instance.c o_mesh.c +SURFOBJS = source.o sphere.o srcobstr.o srcsupp.o srcsamp.o virtuals.o \ + o_face.o o_cone.o o_instance.o o_mesh.o +SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsamp.c virtuals.c \ + 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 @@ -89,18 +89,16 @@ HEADERS = ambient.h ray.h data.h otspecial.h source.h # What this makefile produces: # -PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb +PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb all: $(PROGS) $(RCLIB) $(SPECIAL) install: all rayinit.cal $(INSTALL) $(PROGS) $(INSTDIR) - mv $(RCLIB) ../lib + cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview rm -f $(LIBDIR)/rayinit.cal cp rayinit.cal $(LIBDIR) -aed: $(DEVDIR)/aed - ogl: clean: @@ -119,16 +117,12 @@ $(DESTDIR)/rtrace: $(RTOBJS) $(RLIB) $(DESTDIR)/rpict: $(RPOBJS) $(RLIB) $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS) -$(DESTDIR)/rview: $(RVOBJS) $(RLIB) - $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS) +$(DESTDIR)/rvu: $(RVOBJS) $(RLIB) + $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS) $(DESTDIR)/lookamb: lookamb.o ambio.o $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS) -$(DEVDIR)/aed: aed.o colortab.o tty.o devmain.o editline.o - $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \ -devmain.o tty.o editline.o $(LIBS) - $(RLIB): $(ROBJS) Version.o ar rc $(RLIB) $(ROBJS) Version.o -ranlib $(RLIB) @@ -161,9 +155,6 @@ dielectric.o: dielectric.c source.h devcomm.o: devcomm.c $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c -aed.o: aed.c - $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c - # # Version module: # @@ -176,7 +167,7 @@ Version.c: VERSION $(RSRC) $(HEADERS) # Include dependencies: # -aed.o ambio.o colortab.o data.o devcomm.o \ +ambio.o colortab.o data.o devcomm.o \ devmain.o lookamb.o rview.o x11.o: ../common/color.h freeobjmem.o o_cone.o srcsupp.o: ../common/cone.h @@ -184,20 +175,20 @@ freeobjmem.o o_cone.o srcsupp.o: ../common/cone.h data.o freeobjmem.o m_brdf.o mx_data.o \ p_data.o raycalls.o t_data.o: data.h -aed.o devcomm.o devmain.o devtable.o \ -editline.o tty.o x11.o: driver.h +devcomm.o devmain.o devtable.o \ +editline.o x11.o: driver.h freeobjmem.o o_face.o srcsupp.o: ../common/face.h ambient.o raytrace.o rpmain.o rtmain.o \ -rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h +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 \ raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \ -virtuals.o: ../common/otypes.h +srcdraw.o srcobstr.o virtuals.o: ../common/otypes.h ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \ rtmain.o rpmain.o persist.o source.o rv3.o \ @@ -207,22 +198,26 @@ ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.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 \ -source.o sphere.o srcdraw.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 \ -../common/standard.h ../common/octree.h \ +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 \ +../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \ +../common/rterror.h ../common/octree.h ../common/tifftypes.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 m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \ -source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o: source.h +rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \ +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/mat4.h ../common/fvect.h +duphead.o octree.o: ../common/standard.h ../common/rtmisc.h \ +../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \ +../common/rterror.h ../common/mat4.h ../common/fvect.h ambio.o: ../common/fvect.h -initotypes.o raytrace.o: otspecial.h +initotypes.o srcobstr.o raytrace.o: otspecial.h rpmain.o rtmain.o rvmain.o rpict.o \ srcdraw.o: ../common/view.h ../common/resolu.h @@ -237,17 +232,18 @@ data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \ 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 +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 -devcomm.o: ../common/vfork.h +rtmain.o rpmain.o rvmain.o persist.o duphead.o \ +renderopts.o rpict.o: ../common/paths.h -rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h - freeobjmem.o raycalls.o text.o: ../common/font.h raypcalls.o: ../common/selcall.h o_mesh.o: ../common/mesh.h + +noise3.o: ../common/calcomp.h