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.62 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 2.65 by greg, Thu Jun 14 22:42:21 2012 UTC

# Line 54 | Line 54 | RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.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 + 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  
# Line 89 | Line 92 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
92   # What this makefile produces:
93   #
94  
95 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
95 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
96 > $(DESTDIR)/lookamb
97  
98   all:    $(PROGS) $(RCLIB) $(SPECIAL)
99  
100   install:        all rayinit.cal
101          $(INSTALL) $(PROGS) $(INSTDIR)
102          cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
103 +        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
104          rm -f $(LIBDIR)/rayinit.cal
105          cp rayinit.cal $(LIBDIR)
106  
# Line 121 | Line 126 | $(DESTDIR)/rvu:        $(RVOBJS) $(RCLIB) $(RLIB)
126          $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
127   $(RLIB) $(LIBS) $(DLIBS)
128  
129 + $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
130 +        $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
131 +
132   $(DESTDIR)/lookamb:     lookamb.o ambio.o
133          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
134  
# Line 224 | Line 232 | rv2.o: ../common/resolu.h
232   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
233   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
234  
235 < preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
236 < ../common/instance.h ../common/mesh.h ../common/color.h data.h
235 > preload.o:      data.h func.h ../common/object.h ../common/face.h \
236 > ../common/cone.h ../common/instance.h ../common/mesh.h \
237 > ../common/color.h ../common/bsdf.h ../common/otypes.h
238  
239   rtmain.o rpmain.o rvmain.o persist.o duphead.o \
240   renderopts.o rpict.o:   ../common/paths.h
# Line 245 | Line 254 | o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o
254   srcobstr.o text.o:              rtotypes.h
255  
256   m_bsdf.o:       ambient.h source.h func.h \
257 < ../common/calcomp.h ../common/paths.h ../common/bsdf.h ../common/random.h
257 > ../common/calcomp.h ../common/bsdf.h ../common/random.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines