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.50 by greg, Thu Jun 20 13:43:33 1991 UTC vs.
Revision 1.51 by greg, Mon Jul 15 11:50:26 1991 UTC

# Line 10 | Line 10 | CFLAGS = $(MACH) $(OPT)
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 = bmalloc.o erf.o
31 > LIBS = ../common/librt.a -lm
32  
33   #
34   # Device drivers for rview (see also devtable.c):
# 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 ambcomp.o
64 < RAYSRC = raytrace.c ambient.c ambcomp.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  
67 – SURFOBJS = face.o sphere.o source.o srcsupp.o virtuals.o o_face.o cone.o \
68 –                o_cone.o o_instance.o instance.o
69 – SURFSRC = face.c sphere.c source.c srcsupp.c virtuals.c o_face.c cone.c \
70 –                o_cone.c o_instance.c instance.c
71 –
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  
# Line 78 | Line 74 | MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx
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
76  
81 – MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
82 –                color.o resolu.o urand.o
83 – MISCSRC = misc.c header.c mat4.c xf.c fvect.c savestr.c fgetline.c ealloc.c \
84 –                color.c resolu.c urand.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 185 | Line 176 | caldefn.o:     caldefn.c calcomp.h
176   calfunc.o:      calfunc.c calcomp.h
177          $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
178  
188 – xf.o:   xf.c
189 –        $(CC) $(CFLAGS) -DINVXF -c xf.c
190 –
179   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
180          $(CC) $(CFLAGS) -c nwsdev.c
181  
# Line 200 | Line 188 | nwsdev.h:      nwsdev.cps newsconstants.h
188  
189   caldefn.o calexpr.o calfunc.o:  calcomp.h
190  
191 < aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
192 < devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:      color.h
191 > aed.o colortab.o data.o devcomm.o \
192 > devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       color.h
193  
194 < cone.o o_cone.o srcsupp.o:      cone.h
194 > o_cone.o srcsupp.o:     cone.h
195  
196   data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
197  
198   aed.o devcomm.o devmain.o devtable.o \
199   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
200  
201 < face.o o_face.o srcsupp.o:      face.h
201 > o_face.o srcsupp.o:     face.h
202  
203 < fvect.o:        fvect.h
203 > ambient.o raytrace.o rpmain.o rtmain.o \
204 > rtrace.o rvmain.o rv2.o rv3.o source.o: octree.h
205  
206 < cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
206 > o_instance.o:   instance.h octree.h
207  
208 < ambient.o objset.o octree.o raytrace.o readoct.o \
209 < rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source.o:       octree.h
221 <
222 < o_instance.o instance.o:        instance.h octree.h
223 <
224 < 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 \
208 > ambient.o dielectric.o func.o initotypes.o m_brdf.o \
209 > normal.o o_cone.o text.o raytrace.o rtrace.o \
210   rv2.o source.o srcsupp.o virtuals.o sphere.o:   otypes.h
211  
212   ambient.o ambcomp.o rpict.o rv3.o source.o:     random.h
# Line 237 | Line 221 | rv2.o rv3.o rview.o:   rpaint.h driver.h view.h
221  
222   mirror.o source.o srcsupp.o virtuals.o: source.h
223  
224 < cone.o data.o devcomm.o face.o image.o initotypes.o xf.o misc.o objset.o \
225 < octree.o otypes.o readobj.o readoct.o:  standard.h mat4.h fvect.h
224 > cone.o data.o devcomm.o initotypes.o \
225 > octree.o:       standard.h mat4.h fvect.h
226  
227   initotypes.o raytrace.o:        otspecial.h
228  
245 – mat4.o:         mat4.h fvect.h
246 –
229   sundev.o:       suntools.icon
230  
231 < image.o rpmain.o rtmain.o rvmain.o rpict.o:     view.h
231 > rpmain.o rtmain.o rvmain.o rpict.o:     view.h
232  
233   x10.o xtwind.o: xtwind.h
234  

Diff Legend

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