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.12 by greg, Fri Oct 20 16:54:56 1989 UTC vs.
Revision 1.23 by greg, Thu Mar 8 16:13:41 1990 UTC

# Line 5 | Line 5
5   #
6  
7   OPT = -O
8 < MACH = -DBSD -DIEEE -f68881 /usr/lib/f68881.il
8 > MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
9   CFLAGS = $(MACH) $(OPT)
10  
11   #
# Line 30 | Line 30 | COMPAT = malloc.o
30   #
31   # Device drivers for rview (see also devtable.c):
32   #
33 < DOBJS = devtable.o devcomm.o aed.o tty.o editline.o sun.o x10.o xtwind.o \
33 > DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
34          colortab.o
35   DLIBS = -lX
36 < DRIVERS = $(DEVDIR)/sun.dev $(DEVDIR)/sun.com
36 > DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
37  
38   #
39   # Standard object files:
# Line 94 | Line 94 | $(DESTDIR)/rview:      $(RVOBJS)
94   $(DESTDIR)/lookamb:     lookamb.o
95          cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
96  
97 < $(DEVDIR)/sun.dev:      sundev.o colortab.o
98 <        cc $(CFLAGS) -o $(DEVDIR)/sun.dev sundev.o colortab.o \
99 < -lsuntool -lsunwindow -lpixrect $(LIBS)
97 > $(DEVDIR)/sundev:       sundev.o devmain.o colortab.o editline.o
98 >        cc $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
99 > editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
100  
101   $(DEVDIR)/sun.com:      suncom.o editline.o
102          cc $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
103  
104 + $(DEVDIR)/x11dev:       x11.o x11twind.o colortab.o devmain.o editline.o
105 +        cc $(CFLAGS) -o $(DEVDIR)/x11dev x11.o x11twind.o devmain.o \
106 + colortab.o editline.o -lX11 $(LIBS)
107 +
108   #
109   # Special compiles:
110   #
# Line 129 | Line 133 | rvmain.o:      rmain.c
133   # end of dispersion compiles.
134  
135   sundev.o:       sundev.c
136 <        cc $(CFLAGS) -c sundev.c
136 >        cc $(CFLAGS) -Dsun_init=dinit -c sundev.c
137  
138 < devcomm.o:      devcomm.c
139 <        cc $(CFLAGS) -c devcomm.c
138 > x11.o:  x11.c
139 >        cc $(CFLAGS) -Dx11_init=dinit -c x11.c
140  
141   ambient.o:      ambient.c
142          cc $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
# Line 156 | Line 160 | xf.o:  xf.c
160   caldefn.o calexpr.o calfunc.o:  calcomp.h
161  
162   aed.o color.o colortab.o data.o devcomm.o \
163 < lookamb.o rview.o sundev.o x10.o:       color.h
163 > devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       color.h
164  
165   cone.o o_cone.o source.o:       cone.h
166  
167   data.o mx_data.o p_data.o t_data.o:     data.h
168  
169 < aed.o devcomm.o devtable.o sun.o sundev.o tty.o x10.o:  driver.h
169 > aed.o devcomm.o devmain.o devtable.o \
170 > editline.o sundev.o tty.o x10.o x11.o:  driver.h
171  
172   face.o o_face.o source.o:       face.h
173  
# Line 171 | Line 176 | fvect.o:       fvect.h
176   cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
177  
178   ambient.o objset.o octree.o raytrace.o \
179 < readoct.o rmain.o rv2.o source.o:       octree.h
179 > readoct.o rmain.o rv2.o rv3.o source.o: octree.h
180  
181   o_instance.o instance.o:        instance.h octree.h
182  
183 < cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
183 > ambient.o cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
184   text.o raytrace.o readobj.o readoct.o rtrace.o \
185   rv2.o source.o sphere.o:        otypes.h
186  
# Line 191 | Line 196 | rv2.o rv3.o rview.o:   rpaint.h driver.h view.h
196  
197   source.o:       source.h
198  
199 < cone.o data.o face.o image.o misc.o objset.o octree.o otypes.o \
199 > cone.o data.o devcomm.o face.o image.o misc.o objset.o octree.o otypes.o \
200   readobj.o readoct.o rview.o:    standard.h fvect.h
201  
202   sundev.o:       suntools.icon
# Line 199 | Line 204 | sundev.o:      suntools.icon
204   image.o rmain.o rpict.o:        view.h
205  
206   x10.o xtwind.o: xtwind.h
207 +
208 + x11.o x11twind.o: x11twind.h

Diff Legend

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