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.14 by greg, Fri Oct 27 11:48:18 1989 UTC vs.
Revision 1.34 by greg, Wed Dec 12 22:03:32 1990 UTC

# Line 4 | Line 4
4   #  Compiles for ray tracing programs.
5   #
6  
7 < OPT = -O
8 < MACH = -DBSD -DIEEE -f68881 /usr/lib/f68881.il
7 > OPT = -O -pipe
8 > MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
9   CFLAGS = $(MACH) $(OPT)
10 + CC = cc
11  
12   #
13   # The following are user-definable:
# Line 18 | Line 19 | INSTALL = cp
19   #
20   # The following paths must exist and be relative to root:
21   #
22 < DEVDIR = $(INSTDIR)
22 > DEVDIR = $(INSTDIR)/dev
23   LIBDIR = /usr/local/lib/ray
24  
25   #
# Line 31 | Line 32 | COMPAT = malloc.o
32   # Device drivers for rview (see also devtable.c):
33   #
34   DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
35 <        colortab.o
36 < DLIBS = -lX
37 < DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com
35 >        colortab.o nwsdev.o
36 > DLIBS = -lX -lcps
37 > DRIVERS = $(DEVDIR)/sun $(DEVDIR)/sun.com $(DEVDIR)/x11
38  
39   #
40   # Standard object files:
# Line 55 | Line 56 | RAYOBJS = raytrace.o ambient.o
56   SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
57                  o_cone.o o_instance.o instance.o
58  
59 < MATOBJS = normal.o dielectric.o m_clip.o glass.o
59 > MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o
60  
61   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
62  
63   SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
64  
65 < MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o \
66 <                fgetline.o ealloc.o
65 > MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
66 >                color.o resolu.o
67  
68   #
69   # What this makefile produces:
# Line 83 | Line 84 | clean:
84   #
85  
86   $(DESTDIR)/rtrace:      $(RTOBJS)
87 <        cc $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
87 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
88  
89   $(DESTDIR)/rpict:       $(RPOBJS)
90 <        cc $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
90 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
91  
92   $(DESTDIR)/rview:       $(RVOBJS)
93 <        cc $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
93 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
94  
95   $(DESTDIR)/lookamb:     lookamb.o
96 <        cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
96 >        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
97  
98 < $(DEVDIR)/sundev:       sundev.o devmain.o colortab.o
99 <        cc $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
100 < -lsuntool -lsunwindow -lpixrect $(LIBS)
98 > $(DEVDIR)/sun:  sundev.o devmain.o colortab.o editline.o
99 >        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
100 > editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
101  
102   $(DEVDIR)/sun.com:      suncom.o editline.o
103 <        cc $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
103 >        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun.com suncom.o editline.o
104  
105 + $(DEVDIR)/x11:  x11.o x11twind.o colortab.o devmain.o editline.o
106 +        $(CC) $(CFLAGS) -s -o $(DEVDIR)/x11 x11.o x11twind.o devmain.o \
107 + colortab.o editline.o -lX11 $(LIBS)
108 +
109   #
110   # Special compiles:
111   #
112  
113   rtmain.o:       rmain.c
114 <        cc $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
114 >        $(CC) $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
115          mv rmain.o rtmain.o
116  
117   rpmain.o:       rmain.c
118 <        cc $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
118 >        $(CC) $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
119          mv rmain.o rpmain.o
120  
121   rvmain.o:       rmain.c
122 <        cc $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
122 >        $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
123          mv rmain.o rvmain.o
124  
125   #
126 < # Uncomment the following to model dispersion:
126 > # Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
127   #
128   #dielectric.o:  dielectric.c source.h
129 < #       cc $(CFLAGS) -DDISPERSE -c dielectric.c
129 > #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
130   #
126 – #color.o:       color.c color.h
127 – #       cc $(CFLAGS) -DSPEC_RGB -c color.c
128 – #
131   # end of dispersion compiles.
132  
133 + devcomm.o:      devcomm.c
134 +        $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
135 +
136   sundev.o:       sundev.c
137 <        cc $(CFLAGS) -c sundev.c
137 >        $(CC) $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -Dsun_init=dinit -c sundev.c
138  
139 < devcomm.o:      devcomm.c
140 <        cc $(CFLAGS) -c devcomm.c
139 > x11.o:  x11.c
140 >        $(CC) $(CFLAGS) -Dx11_init=dinit -c x11.c
141  
142   ambient.o:      ambient.c
143 <        cc $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
143 >        $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
144  
145   calexpr.o:      calexpr.c calcomp.h
146 <        cc $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
146 >        $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
147  
148   caldefn.o:      caldefn.c calcomp.h
149 <        cc $(CFLAGS) -DFUNCTION -c caldefn.c
149 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
150  
151   calfunc.o:      calfunc.c calcomp.h
152 <        cc $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
152 >        $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
153  
154   xf.o:   xf.c
155 <        cc $(CFLAGS) -DINVXF -c xf.c
155 >        $(CC) $(CFLAGS) -DINVXF -c xf.c
156  
157 + nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
158 +        $(CC) $(CFLAGS) -c nwsdev.c
159 +
160 + nwsdev.h:       nwsdev.cps newsconstants.h
161 +        cps nwsdev.cps
162 +
163   #
164   # Include dependencies:
165   #
166  
167   caldefn.o calexpr.o calfunc.o:  calcomp.h
168  
169 < aed.o color.o colortab.o data.o devcomm.o \
170 < lookamb.o rview.o sundev.o x10.o:       color.h
169 > aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
170 > devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:      color.h
171  
172   cone.o o_cone.o source.o:       cone.h
173  
174   data.o mx_data.o p_data.o t_data.o:     data.h
175  
176 < aed.o devcomm.o devtable.o sundev.o tty.o x10.o:        driver.h
176 > aed.o devcomm.o devmain.o devtable.o \
177 > editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
178  
179   face.o o_face.o source.o:       face.h
180  
# Line 170 | Line 182 | fvect.o:       fvect.h
182  
183   cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
184  
185 < ambient.o objset.o octree.o raytrace.o \
186 < readoct.o rmain.o rv2.o rv3.o source.o: octree.h
185 > ambient.o objset.o octree.o raytrace.o readoct.o \
186 > rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source.o:       octree.h
187  
188   o_instance.o instance.o:        instance.h octree.h
189  
190 < cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
191 < text.o raytrace.o readobj.o readoct.o rtrace.o \
190 > ambient.o cone.o dielectric.o func.o normal.o o_cone.o objset.o \
191 > otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
192   rv2.o source.o sphere.o:        otypes.h
193  
194   ambient.o rpict.o rv3.o source.o:       random.h
195  
196   ambient.o dielectric.o func.o glass.o m_clip.o \
197   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
198 < p_data.o p_func.o text.o raytrace.o rmain.o rpict.o \
198 > p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
199   rtrace.o rv2.o rv3.o source.o \
200   sphere.o t_data.o t_func.o:     ray.h standard.h fvect.h object.h color.h
201  
# Line 191 | Line 203 | rv2.o rv3.o rview.o:   rpaint.h driver.h view.h
203  
204   source.o:       source.h
205  
206 < cone.o data.o face.o image.o misc.o objset.o octree.o otypes.o \
206 > cone.o data.o devcomm.o face.o image.o misc.o objset.o octree.o otypes.o \
207   readobj.o readoct.o rview.o:    standard.h fvect.h
208  
209   sundev.o:       suntools.icon
210  
211 < image.o rmain.o rpict.o:        view.h
211 > image.o rpmain.o rtmain.o rvmain.o rpict.o:     view.h
212  
213   x10.o xtwind.o: xtwind.h
214 +
215 + x11.o x11twind.o: x11twind.h

Diff Legend

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