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 1.53 by greg, Tue Jul 16 10:39:25 1991 UTC vs.
Revision 1.56 by greg, Fri Jul 19 09:32:58 1991 UTC

# Line 1 | Line 1
1 – # SCCSid "$SunId$ LBL"
2 –
1   #
2 + # SCCSid "$SunId$ LBL"
3   #  Compiles for ray tracing programs.
4   #
5  
# Line 65 | Line 64 | SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_fa
64   SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
65                  o_cone.c o_instance.c
66  
67 < MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o
68 < MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c
67 > MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o \
68 >        m_direct.o
69 > MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \
70 >        m_direct.c
71  
72   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
73   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
74  
75 < SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o
76 < SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c
75 > SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o
76 > SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c
77  
78   #
79   # What this makefile produces:
# Line 101 | Line 102 | lint:  $(RVSRC)
102   # Links:
103   #
104  
105 < $(DESTDIR)/rtrace:      $(RTOBJS)
105 > $(DESTDIR)/rtrace:      $(RTOBJS) ../common/librt.a
106          $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
107  
108 < $(DESTDIR)/rpict:       $(RPOBJS)
108 > $(DESTDIR)/rpict:       $(RPOBJS) ../common/librt.a
109          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
110  
111 < $(DESTDIR)/rview:       $(RVOBJS)
111 > $(DESTDIR)/rview:       $(RVOBJS) ../common/librt.a
112          $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
113  
114   $(DESTDIR)/lookamb:     lookamb.o
# Line 144 | Line 145 | rvmain.o:      rmain.c
145          $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
146          mv rmain.o rvmain.o
147  
148 + readfargs.o:    readfargs.c ../common/object.h
149 +        $(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
150 +
151   #
152   # Uncomment the following to model dispersion:
153   #
154 < #dielectric.o:  dielectric.c source.h
155 < #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
156 < #
154 > dielectric.o:   dielectric.c source.h
155 >        $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
156 >
157   # end of dispersion compiles.
158  
159   devcomm.o:      devcomm.c
# Line 186 | Line 190 | nwsdev.h:      nwsdev.cps newsconstants.h
190   aed.o colortab.o data.o devcomm.o \
191   devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
192  
193 < o_cone.o srcsupp.o:     cone.h
193 > o_cone.o srcsupp.o:     ../common/cone.h
194  
195   data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
196  

Diff Legend

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