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 2.8 by greg, Thu Jul 16 12:09:23 1992 UTC vs.
Revision 2.28 by gregl, Sat Jan 3 20:07:30 1998 UTC

# Line 8 | Line 8 | MACH = -DBSD
8   CFLAGS = $(MACH) $(OPT) -I../common -L../lib
9   SPECIAL = aed
10   CC = cc
11 + MLIB = -lm
12   LINT = lint
13   LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \
14   -DINCHAN -DRCONST -DREDEFW
# Line 28 | Line 29 | LIBDIR = /usr/local/lib/ray
29   #
30   # Library routines:
31   #
32 < LIBS = -lrt -lm
32 > LIBS = -lrt $(MLIB)
33  
34   #
35   # Device drivers for rview (see also devtable.c):
# Line 43 | Line 44 | DLIBS = -lX11
44   # Standard object files:
45   #
46  
47 < RTOBJS = rtmain.o rtrace.o $(ROBJS) Version.o
48 < RTSRC = rmain.c rtrace.c $(RSRC) Version.c
47 > RTOBJS = rtmain.o rtrace.o duphead.o persist.o preload.o $(ROBJS) Version.o
48 > RTSRC = rmain.c rtrace.c duphead.c persist.c preload.c $(RSRC) Version.c
49  
50 < RPOBJS = rpmain.o rpict.o $(ROBJS) Version.o
51 < RPSRC = rmain.c rpict.c $(RSRC) Version.c
50 > RPOBJS = rpmain.o rpict.o srcdraw.o duphead.o persist.o preload.o $(ROBJS) \
51 > Version.o
52 > RPSRC = rmain.c rpict.c srcdraw.c duphead.c persist.c preload.c $(RSRC) \
53 > Version.c
54  
55 < RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS) Version.o
56 < RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC) Version.c
55 > RVOBJS = rvmain.o rview.o rv2.o rv3.o freeobjmem.o $(DOBJS) $(ROBJS) Version.o
56 > RVSRC = rmain.c rview.c rv2.c rv3.c freeobjmem.c $(DSRC) $(RSRC) Version.c
57  
58   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
59          $(MODOBJS) $(SUPPOBJS)
# Line 66 | Line 69 | SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_fac
69                  srcsamp.c o_cone.c o_instance.c
70  
71   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
72 <        m_mirror.o m_direct.o
73 < MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \
74 <        m_direct.c
72 >        m_mirror.o m_direct.o m_mist.o fprism.o
73 > MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
74 >        m_mirror.c m_direct.c m_mist.c fprism.c
75  
76   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
77   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
78  
79 < SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o \
80 <        malloc.o
81 < SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c \
82 <        malloc.c
79 > SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o malloc.o data.o \
80 >        readfargs.o
81 > SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c malloc.c \
82 >        readfargs.c
83  
84   HEADERS = ambient.h ray.h data.h otspecial.h source.h
85  
# Line 149 | Line 152 | $(DEVDIR)/news: nwsdev.o devmain.o editline.o
152   #
153  
154   rtmain.o:       rmain.c
155 <        $(CC) $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
155 >        $(CC) $(CFLAGS) -DRTRACE -DNICE=4 -c rmain.c
156          mv rmain.o rtmain.o
157  
158   rpmain.o:       rmain.c
159 <        $(CC) $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
159 >        $(CC) $(CFLAGS) -DRPICT -DNICE=6 -c rmain.c
160          mv rmain.o rpmain.o
161  
162   rvmain.o:       rmain.c
163 <        $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
163 >        $(CC) $(CFLAGS) -DRVIEW -c rmain.c
164          mv rmain.o rvmain.o
165  
166   readfargs.o:    readfargs.c ../common/object.h
# Line 227 | Line 230 | rtrace.o rvmain.o rv2.o rv3.o source.o:        ../common/octr
230  
231   o_instance.o:   ../common/instance.h ../common/octree.h
232  
233 < ambient.o aniso.o dielectric.o func.o initotypes.o m_brdf.o \
234 < normal.o o_cone.o text.o raytrace.o rtrace.o \
235 < rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
233 > ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
234 > m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
235 > raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
236 > virtuals.o:     ../common/otypes.h
237  
238 < ambient.o ambcomp.o aniso.o normal.o rpict.o \
239 < rv3.o srcsamp.o virtuals.o:     ../common/random.h
238 > ambient.o ambcomp.o aniso.o normal.o rpict.o rvmain.o rtmain.o rpmain.o \
239 > persist.o source.o rv3.o srcsamp.o virtuals.o:  ../common/random.h
240  
241 < ambient.o ambcomp.o aniso.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
242 < m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
243 < p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
244 < rtrace.o rview.o rv2.o rv3.o source.o srcsamp.o srcsupp.o virtuals.o \
245 < sphere.o t_data.o t_func.o:     ray.h ../common/standard.h \
241 > ambcomp.o ambient.o aniso.o dielectric.o func.o glass.o glazing.o \
242 > m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o mx_func.o \
243 > normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o raytrace.o \
244 > rpict.o rtrace.o rv2.o rv3.o rview.o source.o sphere.o srcdraw.o \
245 > srcsamp.o srcsupp.o t_data.o t_func.o text.o rpmain.o rtmain.o rvmain.o \
246 > virtuals.o:     ray.h ../common/standard.h \
247   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
248  
249   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
250  
251 < m_direct.o m_mirror.o \
252 < source.o srcsamp.o srcsupp.o virtuals.o:        source.h
251 > m_direct.o m_mirror.o m_mist.o dielectric.o \
252 > source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:      source.h
253  
254 < cone.o data.o devcomm.o initotypes.o \
255 < octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
254 > cone.o data.o devcomm.o freeobjmem.o initotypes.o fprism.o preload.o \
255 > duphead.o octree.o:     ../common/standard.h ../common/mat4.h ../common/fvect.h
256  
257 + ambio.o:        ../common/fvect.h
258 +
259   initotypes.o raytrace.o:        otspecial.h
260  
261   sundev.o:       suntools.icon
262  
263 < rpmain.o rtmain.o rvmain.o rpict.o:     ../common/view.h
263 > rpmain.o rtmain.o rvmain.o rpict.o srcdraw.o:   ../common/view.h
264  
265   x10.o xtwind.o: xtwind.h
266  
# Line 263 | Line 270 | x11.o: x11icon.h
270  
271   ambient.o ambcomp.o ambio.o lookamb.o:  ambient.h
272  
273 < data.o rmain.o rpict.o rtrace.o rv2.o:  ../common/resolu.h
273 > data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
274 > rv2.o:  ../common/resolu.h
275  
276   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
277   p_func.o t_data.o t_func.o:     func.h
278  
279 + preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
280 + ../common/instance.h ../common/color.h data.h
281 +
282 + freeobjmem.o:   ../common/object.h
283 +
284   devcomm.o:      ../common/vfork.h
285 +
286 + rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h

Diff Legend

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