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.43 by greg, Tue Apr 23 13:01:55 1991 UTC vs.
Revision 1.53 by greg, Tue Jul 16 10:39:25 1991 UTC

# Line 6 | Line 6
6  
7   OPT = -O -pipe
8   MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
9 < CFLAGS = $(MACH) $(OPT)
9 > CFLAGS = $(MACH) $(OPT) -I../common
10   CC = cc
11   LINT = lint
12   LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
13 < -DINCHAN -DRCONST -DREDEFW -DBIGLIB -DINVXF
13 > -DINCHAN -DRCONST -DREDEFW -DBIGLIB
14  
15   #
16   # The following are user-definable:
# Line 28 | Line 28 | LIBDIR = /usr/local/lib/ray
28   #
29   # Library routines:
30   #
31 < LIBS = -lm
32 < COMPAT = malloc.o
31 > LIBS = ../common/librt.a -lm
32  
33   #
34   # Device drivers for rview (see also devtable.c):
35   #
36   DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
37          colortab.o
38 < DSRC = devtable.c devcomm.c editline.c x10.c xtwind.c \
38 > DSRC = devtable.c devcomm.c editline.c x11.c x11twind.c \
39          colortab.c
40   DLIBS = -lX11
41  
# Line 47 | Line 46 | DLIBS = -lX11
46   RTOBJS = rtmain.o rtrace.o $(ROBJS)
47   RTSRC = rmain.c rtrace.c $(RSRC)
48  
49 < RPOBJS = rpmain.o rpict.o image.o $(ROBJS)
50 < RPSRC = rmain.c rpict.c image.c $(RSRC)
49 > RPOBJS = rpmain.o rpict.o $(ROBJS)
50 > RPSRC = rmain.c rpict.c $(RSRC)
51  
52 < RVOBJS = rvmain.o rview.o rv2.o rv3.o image.o $(DOBJS) $(ROBJS)
53 < RVSRC = rmain.c rview.c rv2.c rv3.c image.c $(DSRC) $(RSRC)
52 > RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS)
53 > RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC)
54  
55 < ROBJS = $(OCTOBJS) $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
56 <        $(MODOBJS) $(SUPPOBJS) $(MISCOBJS) $(COMPAT)
57 < RSRC = $(OCTSRC) $(RAYSRC) $(SURFSRC) $(MATSRC) \
58 <        $(MODSRC) $(SUPPSRC) $(MISCSRC)
55 > ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
56 >        $(MODOBJS) $(SUPPOBJS)
57 > RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
58 >        $(MODSRC) $(SUPPSRC)
59  
60 < OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o initotypes.o
61 < OCTSRC = octree.c readobj.c readoct.c objset.c otypes.c initotypes.c
60 > RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
61 > RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
62  
63 < RAYOBJS = raytrace.o ambient.o
64 < RAYSRC = raytrace.c ambient.c
63 > SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
64 >        o_instance.o
65 > SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
66 >                o_cone.c o_instance.c
67  
68 < SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
69 <                o_cone.o o_instance.o instance.o
69 < SURFSRC = face.c sphere.c source.c o_face.c cone.c \
70 <                o_cone.c o_instance.c instance.c
68 > MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o
69 > MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c
70  
72 MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o
73 MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c
74
71   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
72   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
73  
74 < SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
75 < SUPPSRC = zeroes.c calexpr.c caldefn.c calfunc.c func.c noise3.c data.c
74 > SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o
75 > SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c
76  
81 MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
82                color.o resolu.o
83 MISCSRC = misc.c header.c mat4.c xf.c fvect.c savestr.c fgetline.c ealloc.c \
84                color.c resolu.c
85
77   #
78   # What this makefile produces:
79   #
# Line 154 | Line 145 | rvmain.o:      rmain.c
145          mv rmain.o rvmain.o
146  
147   #
148 < # Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
148 > # Uncomment the following to model dispersion:
149   #
150   #dielectric.o:  dielectric.c source.h
151   #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
# Line 176 | Line 167 | aed.o: aed.c
167   ambient.o:      ambient.c
168          $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
169  
170 < calexpr.o:      calexpr.c calcomp.h
170 > calexpr.o:      calexpr.c ../common/calcomp.h
171          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
172  
173 < caldefn.o:      caldefn.c calcomp.h
174 <        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -DRCONST -c caldefn.c
173 > caldefn.o:      caldefn.c ../common/calcomp.h
174 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
175  
185 calfunc.o:      calfunc.c calcomp.h
186        $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
187
188 xf.o:   xf.c
189        $(CC) $(CFLAGS) -DINVXF -c xf.c
190
176   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
177          $(CC) $(CFLAGS) -c nwsdev.c
178  
# Line 198 | Line 183 | nwsdev.h:      nwsdev.cps newsconstants.h
183   # Include dependencies:
184   #
185  
186 < caldefn.o calexpr.o calfunc.o:  calcomp.h
186 > aed.o colortab.o data.o devcomm.o \
187 > devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
188  
189 < aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
204 < devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:      color.h
189 > o_cone.o srcsupp.o:     cone.h
190  
206 cone.o o_cone.o source.o:       cone.h
207
191   data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
192  
193   aed.o devcomm.o devmain.o devtable.o \
194   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
195  
196 < face.o o_face.o source.o:       face.h
196 > o_face.o srcsupp.o:     ../common/face.h
197  
198 < fvect.o:        fvect.h
198 > ambient.o raytrace.o rpmain.o rtmain.o \
199 > rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
200  
201 < cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
201 > o_instance.o:   ../common/instance.h ../common/octree.h
202  
203 < ambient.o objset.o octree.o raytrace.o readoct.o \
204 < rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source.o:       octree.h
203 > ambient.o dielectric.o func.o initotypes.o m_brdf.o \
204 > normal.o o_cone.o text.o raytrace.o rtrace.o \
205 > rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
206  
207 < o_instance.o instance.o:        instance.h octree.h
207 > ambient.o ambcomp.o rpict.o rv3.o source.o:     ../common/random.h
208  
209 < ambient.o cone.o dielectric.o func.o initotypes.o m_brdf.o normal.o o_cone.o \
225 < objset.o otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
226 < rv2.o source.o sphere.o:        otypes.h
227 <
228 < ambient.o rpict.o rv3.o source.o:       random.h
229 <
230 < ambient.o dielectric.o func.o glass.o m_clip.o \
209 > ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
210   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
211   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
212 < rtrace.o rv2.o rv3.o source.o sphere.o \
213 < t_data.o t_func.o:      ray.h standard.h mat4.h fvect.h object.h color.h
212 > rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
213 > t_data.o t_func.o:      ray.h ../common/standard.h ../common/mat4.h \
214 > ../common/fvect.h ../common/object.h ../common/color.h
215  
216 < rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
216 > rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
217  
218 < source.o:       source.h
218 > mirror.o source.o srcsupp.o virtuals.o: source.h
219  
220 < cone.o data.o devcomm.o face.o image.o initotypes.o xf.o misc.o objset.o \
221 < octree.o otypes.o readobj.o readoct.o rview.o:  standard.h mat4.h fvect.h
220 > cone.o data.o devcomm.o initotypes.o \
221 > octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
222  
223 < mat4.o:         mat4.h fvect.h
223 > initotypes.o raytrace.o:        otspecial.h
224  
225   sundev.o:       suntools.icon
226  
227 < image.o rpmain.o rtmain.o rvmain.o rpict.o:     view.h
227 > rpmain.o rtmain.o rvmain.o rpict.o:     ../common/view.h
228  
229   x10.o xtwind.o: xtwind.h
230  
231   x11.o x11twind.o: x11twind.h
232  
233   x11.o:  x11icon.h
234 +
235 + ambient.o ambcomp.o lookamb.o:  ambient.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines