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

Comparing ray/src/rt/Rmakefile (file contents):
Revision 1.51 by greg, Mon Jul 15 11:50:26 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  
6   OPT = -O -pipe
7   MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
8 < CFLAGS = $(MACH) $(OPT)
8 > CFLAGS = $(MACH) $(OPT) -I../common
9   CC = cc
10   LINT = lint
11   LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
# 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 calfunc.o func.o noise3.o data.o
76 < SUPPSRC = zeroes.c calexpr.c caldefn.c calfunc.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 167 | Line 171 | aed.o: aed.c
171   ambient.o:      ambient.c
172          $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
173  
174 < calexpr.o:      calexpr.c calcomp.h
174 > calexpr.o:      calexpr.c ../common/calcomp.h
175          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
176  
177 < caldefn.o:      caldefn.c calcomp.h
178 <        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -DRCONST -c caldefn.c
177 > caldefn.o:      caldefn.c ../common/calcomp.h
178 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
179  
176 – calfunc.o:      calfunc.c calcomp.h
177 –        $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
178 –
180   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
181          $(CC) $(CFLAGS) -c nwsdev.c
182  
# Line 186 | Line 187 | nwsdev.h:      nwsdev.cps newsconstants.h
187   # Include dependencies:
188   #
189  
189 – caldefn.o calexpr.o calfunc.o:  calcomp.h
190 –
190   aed.o colortab.o data.o devcomm.o \
191 < devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       color.h
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  
197   aed.o devcomm.o devmain.o devtable.o \
198   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
199  
200 < o_face.o srcsupp.o:     face.h
200 > o_face.o srcsupp.o:     ../common/face.h
201  
202   ambient.o raytrace.o rpmain.o rtmain.o \
203 < rtrace.o rvmain.o rv2.o rv3.o source.o: octree.h
203 > rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
204  
205 < o_instance.o:   instance.h octree.h
205 > o_instance.o:   ../common/instance.h ../common/octree.h
206  
207   ambient.o dielectric.o func.o initotypes.o m_brdf.o \
208   normal.o o_cone.o text.o raytrace.o rtrace.o \
209 < rv2.o source.o srcsupp.o virtuals.o sphere.o:   otypes.h
209 > rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
210  
211 < ambient.o ambcomp.o rpict.o rv3.o source.o:     random.h
211 > ambient.o ambcomp.o rpict.o rv3.o source.o:     ../common/random.h
212  
213   ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
214   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
215   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
216   rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
217 < t_data.o t_func.o:      ray.h standard.h mat4.h fvect.h object.h color.h
217 > t_data.o t_func.o:      ray.h ../common/standard.h ../common/mat4.h \
218 > ../common/fvect.h ../common/object.h ../common/color.h
219  
220 < rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
220 > rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
221  
222   mirror.o source.o srcsupp.o virtuals.o: source.h
223  
224   cone.o data.o devcomm.o initotypes.o \
225 < octree.o:       standard.h mat4.h fvect.h
225 > octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
226  
227   initotypes.o raytrace.o:        otspecial.h
228  
229   sundev.o:       suntools.icon
230  
231 < rpmain.o rtmain.o rvmain.o rpict.o:     view.h
231 > rpmain.o rtmain.o rvmain.o rpict.o:     ../common/view.h
232  
233   x10.o xtwind.o: xtwind.h
234  

Diff Legend

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