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.63 by greg, Wed Oct 9 12:27:50 1991 UTC vs.
Revision 2.15 by greg, Thu Dec 9 17:31:10 1993 UTC

# Line 1 | Line 1
1   #
2   # SCCSid "$SunId$ LBL"
3 < #  Compiles for ray tracing programs.
3 > # Compiles for ray tracing programs.
4   #
5  
6 < OPT = -O -pipe
7 < MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
6 > OPT = -O
7 > MACH = -DBSD
8   CFLAGS = $(MACH) $(OPT) -I../common -L../lib
9 + SPECIAL = aed
10   CC = cc
11 + MLIB = -lm
12   LINT = lint
13 < LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
14 < -DINCHAN -DRCONST -DREDEFW -DBIGLIB
13 > LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \
14 > -DINCHAN -DRCONST -DREDEFW
15  
16   #
17   # The following are user-definable:
18   #
19   DESTDIR = .
20 < INSTDIR = /lumen/lumen/ray/bin.sun3
20 > INSTDIR = /usr/local/bin
21   INSTALL = cp
22  
23   #
# Line 27 | 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 42 | Line 44 | DLIBS = -lX11
44   # Standard object files:
45   #
46  
47 < RTOBJS = rtmain.o rtrace.o $(ROBJS) Version.o
47 > RTOBJS = rtmain.o rtrace.o duphead.o persist.o preload.o $(ROBJS) Version.o
48   RTSRC = rmain.c rtrace.c $(RSRC) Version.c
49  
50 < RPOBJS = rpmain.o rpict.o $(ROBJS) Version.o
50 > RPOBJS = rpmain.o rpict.o duphead.o persist.o preload.o $(ROBJS) Version.o
51   RPSRC = rmain.c rpict.c $(RSRC) Version.c
52  
53 < RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS) Version.o
54 < RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC) Version.c
53 > RVOBJS = rvmain.o rview.o rv2.o rv3.o freeobjmem.o $(DOBJS) $(ROBJS) Version.o
54 > RVSRC = rmain.c rview.c rv2.c rv3.c freeobjmem.c $(DSRC) $(RSRC) Version.c
55  
56   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
57          $(MODOBJS) $(SUPPOBJS)
58   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
59          $(MODSRC) $(SUPPSRC)
60  
61 < RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
62 < RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
61 > RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o ambio.o
62 > RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c ambio.c
63  
64 < SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
65 <        o_instance.o
64 > SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
65 >        o_cone.o o_instance.o
66   SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
67 <                o_cone.c o_instance.c
67 >                srcsamp.c o_cone.c o_instance.c
68  
69 < MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o \
70 <        m_direct.o
71 < MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \
72 <        m_direct.c
69 > MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
70 >        m_mirror.o m_direct.o fprism.o
71 > MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
72 >        m_mirror.c m_direct.c fprism.c
73  
74   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
75   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
# Line 85 | Line 87 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
87  
88   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
89  
90 < all:    $(PROGS)
90 > all:    $(PROGS) $(SPECIAL)
91  
92 < install:        $(PROGS) rayinit.cal
92 > install:        $(PROGS) $(SPECIAL) rayinit.cal
93          $(INSTALL) $(PROGS) $(INSTDIR)
94          rm -f $(LIBDIR)/rayinit.cal
95          cp rayinit.cal $(LIBDIR)
# Line 98 | Line 100 | x10:   $(DEVDIR)/x10
100  
101   aed:    $(DEVDIR)/aed
102  
103 + sgi:    $(DEVDIR)/news
104 +
105   tiff:  
106  
107   clean:
# Line 119 | Line 123 | $(DESTDIR)/rpict:      $(RPOBJS)
123   $(DESTDIR)/rview:       $(RVOBJS)
124          $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
125  
126 < $(DESTDIR)/lookamb:     lookamb.o
127 <        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
126 > $(DESTDIR)/lookamb:     lookamb.o ambio.o
127 >        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrt
128  
129   $(DEVDIR)/sun:  sundev.o devmain.o colortab.o editline.o
130          $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
# Line 137 | Line 141 | $(DEVDIR)/aed: aed.o colortab.o tty.o devmain.o editli
141          $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
142   devmain.o tty.o editline.o $(LIBS)
143  
144 + $(DEVDIR)/news: nwsdev.o devmain.o editline.o
145 +        $(CC) $(CFLAGS) -s -o $(DEVDIR)/news nwsdev.o devmain.o editline.o \
146 + -lcps $(LIBS)
147 +
148   #
149   # Special compiles:
150   #
# Line 179 | Line 187 | x10.o: x10.c
187   aed.o:  aed.c
188          $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
189  
182 – ambient.o:      ambient.c
183 –        $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
184 –
190   calexpr.o:      calexpr.c ../common/calcomp.h
191          $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
192  
# Line 189 | Line 194 | caldefn.o:     caldefn.c ../common/calcomp.h
194          $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
195  
196   nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
197 <        $(CC) $(CFLAGS) -c nwsdev.c
197 >        $(CC) $(CFLAGS) -Dnws_init=dinit -c nwsdev.c
198  
199   nwsdev.h:       nwsdev.cps newsconstants.h
200          cps nwsdev.cps
# Line 206 | Line 211 | Version.c:     VERSION $(RSRC) $(HEADERS)
211   # Include dependencies:
212   #
213  
214 < aed.o colortab.o data.o devcomm.o \
214 > aed.o ambio.o colortab.o data.o devcomm.o \
215   devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
216  
217   o_cone.o srcsupp.o:     ../common/cone.h
# Line 223 | Line 228 | rtrace.o rvmain.o rv2.o rv3.o source.o:        ../common/octr
228  
229   o_instance.o:   ../common/instance.h ../common/octree.h
230  
231 < ambient.o dielectric.o func.o initotypes.o m_brdf.o \
232 < normal.o o_cone.o text.o raytrace.o rtrace.o \
231 > ambient.o aniso.o dielectric.o func.o initotypes.o m_brdf.o \
232 > normal.o o_cone.o text.o raytrace.o rtrace.o freeobjmem.o \
233   rv2.o source.o srcsupp.o virtuals.o sphere.o:   ../common/otypes.h
234  
235 < ambient.o ambcomp.o rpict.o rv3.o source.o:     ../common/random.h
235 > ambient.o ambcomp.o aniso.o normal.o rpict.o \
236 > rv3.o srcsamp.o virtuals.o:     ../common/random.h
237  
238 < ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
238 > ambient.o ambcomp.o aniso.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
239   m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
240   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
241 < rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
242 < t_data.o t_func.o:      ray.h ../common/standard.h ../common/mat4.h \
243 < ../common/fvect.h ../common/object.h ../common/color.h
241 > rtrace.o rview.o rv2.o rv3.o source.o srcsamp.o srcsupp.o virtuals.o \
242 > sphere.o t_data.o t_func.o persist.o duphead.o: ray.h ../common/standard.h \
243 > ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
244  
245   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h
246  
247 < mirror.o source.o srcsupp.o virtuals.o: source.h
247 > m_direct.o m_mirror.o \
248 > source.o srcsamp.o srcsupp.o virtuals.o:        source.h
249  
250 < cone.o data.o devcomm.o initotypes.o \
250 > cone.o data.o devcomm.o freeobjmem.o initotypes.o fprism.o \
251   octree.o:       ../common/standard.h ../common/mat4.h ../common/fvect.h
252  
253   initotypes.o raytrace.o:        otspecial.h
# Line 255 | Line 262 | x11.o x11twind.o: x11twind.h
262  
263   x11.o:  x11icon.h
264  
265 < ambient.o ambcomp.o lookamb.o:  ambient.h
265 > ambient.o ambcomp.o ambio.o lookamb.o:  ambient.h
266 >
267 > data.o rmain.o rpict.o rtrace.o rv2.o:  ../common/resolu.h
268 >
269 > aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
270 > p_func.o t_data.o t_func.o:     func.h
271 >
272 > freeobjmem.o:   ../common/object.h
273 >
274 > devcomm.o:      ../common/vfork.h
275 >
276 > 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