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.29 by greg, Thu Sep 6 23:31:23 1990 UTC vs.
Revision 1.34 by greg, Wed Dec 12 22:03:32 1990 UTC

# Line 19 | 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 34 | Line 34 | COMPAT = malloc.o
34   DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
35          colortab.o nwsdev.o
36   DLIBS = -lX -lcps
37 < DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
37 > DRIVERS = $(DEVDIR)/sun $(DEVDIR)/sun.com $(DEVDIR)/x11
38  
39   #
40   # Standard object files:
# Line 56 | 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 95 | Line 95 | $(DESTDIR)/rview:      $(RVOBJS)
95   $(DESTDIR)/lookamb:     lookamb.o
96          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
97  
98 < $(DEVDIR)/sundev:       sundev.o devmain.o colortab.o editline.o
99 <        $(CC) $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
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)/x11dev:       x11.o x11twind.o colortab.o devmain.o editline.o
106 <        $(CC) $(CFLAGS) -o $(DEVDIR)/x11dev x11.o x11twind.o devmain.o \
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   #
# Line 123 | Line 123 | rvmain.o:      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
130   #
131 – #color.o:       color.c color.h
132 – #       $(CC) $(CFLAGS) -DSPEC_RGB -c color.c
133 – #
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) -Dsun_init=dinit -c sundev.c
137 >        $(CC) $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -Dsun_init=dinit -c sundev.c
138  
139   x11.o:  x11.c
140          $(CC) $(CFLAGS) -Dx11_init=dinit -c x11.c
# Line 166 | Line 166 | nwsdev.h:      nwsdev.cps newsconstants.h
166  
167   caldefn.o calexpr.o calfunc.o:  calcomp.h
168  
169 < aed.o color.o colortab.o data.o devcomm.o \
170 < devmain.o lookamb.o rview.o sundev.o x10.o x11.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  

Diff Legend

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