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.29 by greg, Thu Sep 6 23:31:23 1990 UTC vs.
Revision 1.39 by greg, Thu Mar 7 15:12:09 1991 UTC

# Line 5 | Line 5
5   #
6  
7   OPT = -O -pipe
8 < MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
8 > MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
9   CFLAGS = $(MACH) $(OPT)
10   CC = cc
11 + LINT = lint
12 + LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
13 + -DINCHAN -DRCONST -DREDEFW -DBIGLIB -DINVXF
14  
15   #
16   # The following are user-definable:
17   #
18   DESTDIR = .
19 < INSTDIR = /usr/local/ray
19 > INSTDIR = /lumen/lumen/ray/bin.sun3
20   INSTALL = cp
21  
22   #
23   # The following paths must exist and be relative to root:
24   #
25 < DEVDIR = $(INSTDIR)
25 > DEVDIR = $(INSTDIR)/dev
26   LIBDIR = /usr/local/lib/ray
27  
28   #
# Line 31 | Line 34 | COMPAT = malloc.o
34   #
35   # Device drivers for rview (see also devtable.c):
36   #
37 < DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
38 <        colortab.o nwsdev.o
39 < DLIBS = -lX -lcps
40 < DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
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 \
40 >        colortab.c
41 > DLIBS = -lX11
42  
43   #
44   # Standard object files:
45   #
46  
47   RTOBJS = rtmain.o rtrace.o $(ROBJS)
48 + RTSRC = rmain.c rtrace.c $(RSRC)
49  
50   RPOBJS = rpmain.o rpict.o image.o $(ROBJS)
51 + RPSRC = rmain.c rpict.c image.c $(RSRC)
52  
53   RVOBJS = rvmain.o rview.o rv2.o rv3.o image.o $(DOBJS) $(ROBJS)
54 + RVSRC = rmain.c rview.c rv2.c rv3.c image.c $(DSRC) $(RSRC)
55  
56   ROBJS = $(OCTOBJS) $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
57          $(MODOBJS) $(SUPPOBJS) $(MISCOBJS) $(COMPAT)
58 + RSRC = $(OCTSRC) $(RAYSRC) $(SURFSRC) $(MATSRC) \
59 +        $(MODSRC) $(SUPPSRC) $(MISCSRC)
60  
61 < OCTOBJS = octree.o readobj.o readoct.o objset.o otypes.o
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
66  
67   SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
68                  o_cone.o o_instance.o instance.o
69 + SURFSRC = face.c sphere.c source.c o_face.c cone.c \
70 +                o_cone.c o_instance.c instance.c
71  
72 < MATOBJS = normal.o dielectric.o m_clip.o glass.o
72 > MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o
73 > MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c
74  
75   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
76 + MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
77  
78   SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
79 + SUPPSRC = zeroes.c calexpr.c caldefn.c calfunc.c func.c noise3.c data.c
80  
81 < MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o \
82 <                fgetline.o ealloc.o
81 > MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
82 >                color.o resolu.o
83 > MISCSRC = misc.c header.c mat4.c xf.c fvect.c savestr.c fgetline.c ealloc.c \
84 >                color.c resolu.c
85  
86   #
87   # What this makefile produces:
# Line 71 | Line 89 | MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o
89  
90   PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
91  
92 < all:    $(PROGS) $(DRIVERS)
92 > all:    $(PROGS)
93  
94 < install:        all
94 > install:        $(PROGS)
95          $(INSTALL) $(PROGS) $(INSTDIR)
96  
97 + sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
98 +
99 + x10:    $(DEVDIR)/x10
100 +
101 + aed:
102 +        @echo
103 +
104   clean:
105 <        rm -f *.o core
105 >        rm -f $(PROGS) *.o core
106  
107 + lint:   $(RVSRC)
108 +        $(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
109 +
110   #
111   # Links:
112   #
# Line 95 | Line 123 | $(DESTDIR)/rview:      $(RVOBJS)
123   $(DESTDIR)/lookamb:     lookamb.o
124          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
125  
126 < $(DEVDIR)/sundev:       sundev.o devmain.o colortab.o editline.o
127 <        $(CC) $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
126 > $(DEVDIR)/sun:  sundev.o devmain.o colortab.o editline.o
127 >        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
128   editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
129  
130   $(DEVDIR)/sun.com:      suncom.o editline.o
131 <        $(CC) $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
131 >        $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun.com suncom.o editline.o
132  
133 < $(DEVDIR)/x11dev:       x11.o x11twind.o colortab.o devmain.o editline.o
134 <        $(CC) $(CFLAGS) -o $(DEVDIR)/x11dev x11.o x11twind.o devmain.o \
135 < colortab.o editline.o -lX11 $(LIBS)
133 > $(DEVDIR)/x10:  x10.o xtwind.o colortab.o devmain.o editline.o
134 >        $(CC) $(CFLAGS) -s -o $(DEVDIR)/x10 x10.o xtwind.o devmain.o \
135 > colortab.o editline.o -lX $(LIBS)
136  
137   #
138   # Special compiles:
# Line 123 | Line 151 | rvmain.o:      rmain.c
151          mv rmain.o rvmain.o
152  
153   #
154 < # Uncomment the following to model dispersion:
154 > # Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
155   #
156   #dielectric.o:  dielectric.c source.h
157   #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
158   #
131 – #color.o:       color.c color.h
132 – #       $(CC) $(CFLAGS) -DSPEC_RGB -c color.c
133 – #
159   # end of dispersion compiles.
160  
161 + devcomm.o:      devcomm.c
162 +        $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
163 +
164   sundev.o:       sundev.c
165 <        $(CC) $(CFLAGS) -Dsun_init=dinit -c sundev.c
165 >        $(CC) $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -Dsun_init=dinit -c sundev.c
166  
167 < x11.o:  x11.c
168 <        $(CC) $(CFLAGS) -Dx11_init=dinit -c x11.c
167 > x10.o:  x10.c
168 >        $(CC) $(CFLAGS) -Dx_init=dinit -c x10.c
169  
170   ambient.o:      ambient.c
171          $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
# Line 166 | Line 194 | nwsdev.h:      nwsdev.cps newsconstants.h
194  
195   caldefn.o calexpr.o calfunc.o:  calcomp.h
196  
197 < aed.o color.o colortab.o data.o devcomm.o \
198 < devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       color.h
197 > aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
198 > devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:      color.h
199  
200   cone.o o_cone.o source.o:       cone.h
201  
202 < data.o mx_data.o p_data.o t_data.o:     data.h
202 > data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
203  
204   aed.o devcomm.o devmain.o devtable.o \
205   editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
# Line 187 | Line 215 | rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source
215  
216   o_instance.o instance.o:        instance.h octree.h
217  
218 < ambient.o cone.o dielectric.o func.o normal.o o_cone.o objset.o \
219 < otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
218 > ambient.o cone.o dielectric.o func.o initotypes.o m_brdf.o normal.o o_cone.o \
219 > objset.o otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
220   rv2.o source.o sphere.o:        otypes.h
221  
222   ambient.o rpict.o rv3.o source.o:       random.h
223  
224   ambient.o dielectric.o func.o glass.o m_clip.o \
225 < mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
225 > m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
226   p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
227 < rtrace.o rv2.o rv3.o source.o \
228 < sphere.o t_data.o t_func.o:     ray.h standard.h fvect.h object.h color.h
227 > rtrace.o rv2.o rv3.o source.o sphere.o \
228 > t_data.o t_func.o:      ray.h standard.h mat4.h fvect.h object.h color.h
229  
230   rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
231  
232   source.o:       source.h
233  
234 < cone.o data.o devcomm.o face.o image.o misc.o objset.o octree.o otypes.o \
235 < readobj.o readoct.o rview.o:    standard.h fvect.h
234 > cone.o data.o devcomm.o face.o image.o initotypes.o xf.o misc.o objset.o \
235 > octree.o otypes.o readobj.o readoct.o rview.o:  standard.h mat4.h fvect.h
236 >
237 > mat4.o:         mat4.h fvect.h
238  
239   sundev.o:       suntools.icon
240  

Diff Legend

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