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.16 by greg, Fri Jan 12 11:27:22 1990 UTC

# 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 \
97 > $(DEVDIR)/sundev:       sundev.o devmain.o colortab.o
98 >        cc $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
99   -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
105 +        cc $(CFLAGS) -o $(DEVDIR)/x11dev devmain.o sundev.o colortab.o \
106 + -lX11 $(LIBS)
107 +
108   #
109   # Special compiles:
110   #
# Line 162 | Line 166 | 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 devtable.o sundev.o tty.o x10.o:        driver.h
170  
171   face.o o_face.o source.o:       face.h
172  
# Line 171 | Line 175 | fvect.o:       fvect.h
175   cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
176  
177   ambient.o objset.o octree.o raytrace.o \
178 < readoct.o rmain.o rv2.o source.o:       octree.h
178 > readoct.o rmain.o rv2.o rv3.o source.o: octree.h
179  
180   o_instance.o instance.o:        instance.h octree.h
181  
182 < cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
182 > ambient.o cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
183   text.o raytrace.o readobj.o readoct.o rtrace.o \
184   rv2.o source.o sphere.o:        otypes.h
185  
# Line 199 | Line 203 | sundev.o:      suntools.icon
203   image.o rmain.o rpict.o:        view.h
204  
205   x10.o xtwind.o: xtwind.h
206 +
207 + x11.o x11twind.o: x11twind.h

Diff Legend

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