ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/Rmakefile
(Generate patch)

Comparing ray/src/rt/Rmakefile (file contents):
Revision 2.43 by greg, Wed Dec 31 19:38:27 2003 UTC vs.
Revision 2.46 by greg, Thu Oct 21 21:44:59 2004 UTC

# Line 33 | Line 33 | RCLIB = ../lib/libraycalls.a
33   LIBS = -lrt $(MLIB)
34  
35   #
36 < # Device drivers for rview (see also devtable.c):
36 > # Device drivers for rvu (see also devtable.c):
37   #
38   DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
39          colortab.o
# Line 69 | Line 69 | RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c init
69  
70   SURFOBJS = source.o sphere.o srcobstr.o srcsupp.o srcsamp.o virtuals.o \
71          o_face.o o_cone.o o_instance.o o_mesh.o
72 < SURFSRC = sphere.c source.c srcobstr.o srcsupp.c srcsamp.c virtuals.c \
72 > SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsamp.c virtuals.c \
73          o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c
74  
75   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
# Line 89 | Line 89 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
89   # What this makefile produces:
90   #
91  
92 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
92 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
93  
94   all:    $(PROGS) $(RCLIB) $(SPECIAL)
95  
96   install:        all rayinit.cal
97          $(INSTALL) $(PROGS) $(INSTDIR)
98 +        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
99          rm -f $(LIBDIR)/rayinit.cal
100          cp rayinit.cal $(LIBDIR)
101  
# Line 118 | Line 119 | $(DESTDIR)/rtrace:     $(RTOBJS) $(RLIB)
119   $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
120          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
121  
122 < $(DESTDIR)/rview:       $(RVOBJS) $(RLIB)
123 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
122 > $(DESTDIR)/rvu: $(RVOBJS) $(RLIB)
123 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
124  
125   $(DESTDIR)/lookamb:     lookamb.o ambio.o
126          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
# Line 245 | Line 246 | p_func.o t_data.o t_func.o:    func.h ../common/calcomp.h
246   preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
247   ../common/instance.h ../common/mesh.h ../common/color.h data.h
248  
249 < rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h
249 > rtmain.o rpmain.o rvmain.o persist.o duphead.o \
250 > renderopts.o rpict.o:   ../common/paths.h
251  
252   freeobjmem.o raycalls.o text.o: ../common/font.h
253  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines