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.39 by greg, Thu Mar 7 15:12:09 1991 UTC vs.
Revision 1.48 by greg, Wed Jun 19 15:08:41 1991 UTC

# Line 29 | Line 29 | LIBDIR = /usr/local/lib/ray
29   # Library routines:
30   #
31   LIBS = -lm
32 < COMPAT = malloc.o
32 > COMPAT = bmalloc.o erf.o
33  
34   #
35   # Device drivers for rview (see also devtable.c):
36   #
37   DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
38          colortab.o
39 < DSRC = devtable.c devcomm.c editline.c x10.c xtwind.c \
39 > DSRC = devtable.c devcomm.c editline.c x11.c x11twind.c \
40          colortab.c
41   DLIBS = -lX11
42  
# Line 61 | Line 61 | RSRC = $(OCTSRC) $(RAYSRC) $(SURFSRC) $(MATSRC) \
61   OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o initotypes.o
62   OCTSRC = octree.c readobj.c readoct.c objset.c otypes.c initotypes.c
63  
64 < RAYOBJS = raytrace.o ambient.o
65 < RAYSRC = raytrace.c ambient.c
64 > RAYOBJS = raytrace.o ambient.o ambcomp.o
65 > RAYSRC = raytrace.c ambient.c ambcomp.c
66  
67   SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
68                  o_cone.o o_instance.o instance.o
# Line 79 | Line 79 | SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func
79   SUPPSRC = zeroes.c calexpr.c caldefn.c calfunc.c func.c noise3.c data.c
80  
81   MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
82 <                color.o resolu.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
84 >                color.c resolu.c urand.c
85  
86   #
87   # What this makefile produces:
# Line 98 | Line 98 | sun:   $(DEVDIR)/sun $(DEVDIR)/sun.com
98  
99   x10:    $(DEVDIR)/x10
100  
101 < aed:
102 <        @echo
101 > aed:    $(DEVDIR)/aed
102  
103   clean:
104 <        rm -f $(PROGS) *.o core
104 >        set nonomatch; rm -f $(PROGS) *.o core
105  
106   lint:   $(RVSRC)
107          $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
# Line 134 | Line 133 | $(DEVDIR)/x10: x10.o xtwind.o colortab.o devmain.o edi
133          $(CC) $(CFLAGS) -s -o $(DEVDIR)/x10 x10.o xtwind.o devmain.o \
134   colortab.o editline.o -lX $(LIBS)
135  
136 + $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o
137 +        $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
138 + devmain.o tty.o editline.o $(LIBS)
139 +
140   #
141   # Special compiles:
142   #
# Line 167 | Line 170 | sundev.o:      sundev.c
170   x10.o:  x10.c
171          $(CC) $(CFLAGS) -Dx_init=dinit -c x10.c
172  
173 + aed.o:  aed.c
174 +        $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
175 +
176   ambient.o:      ambient.c
177          $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
178  
# Line 174 | Line 180 | calexpr.o:     calexpr.c calcomp.h
180          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
181  
182   caldefn.o:      caldefn.c calcomp.h
183 <        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
183 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -DRCONST -c caldefn.c
184  
185   calfunc.o:      calfunc.c calcomp.h
186          $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
# Line 219 | Line 225 | ambient.o cone.o dielectric.o func.o initotypes.o m_br
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
228 > ambient.o ambcomp.o rpict.o rv3.o source.o:     random.h
229  
230 < ambient.o dielectric.o func.o glass.o m_clip.o \
230 > ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o \
231   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
232   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
233 < rtrace.o rv2.o rv3.o source.o sphere.o \
233 > rtrace.o rview.o rv2.o rv3.o source.o sphere.o \
234   t_data.o t_func.o:      ray.h standard.h mat4.h fvect.h object.h color.h
235  
236   rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
# Line 232 | Line 238 | rv2.o rv3.o rview.o:   rpaint.h driver.h view.h
238   source.o:       source.h
239  
240   cone.o data.o devcomm.o face.o image.o initotypes.o xf.o misc.o objset.o \
241 < octree.o otypes.o readobj.o readoct.o rview.o:  standard.h mat4.h fvect.h
241 > octree.o otypes.o readobj.o readoct.o:  standard.h mat4.h fvect.h
242  
243 + initotypes.o raytrace.o:        otspecial.h
244 +
245   mat4.o:         mat4.h fvect.h
246  
247   sundev.o:       suntools.icon
# Line 243 | Line 251 | image.o rpmain.o rtmain.o rvmain.o rpict.o:    view.h
251   x10.o xtwind.o: xtwind.h
252  
253   x11.o x11twind.o: x11twind.h
254 +
255 + x11.o:  x11icon.h
256 +
257 + ambient.o ambcomp.o lookamb.o:  ambient.h

Diff Legend

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