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.53 by greg, Tue Jul 16 10:39:25 1991 UTC vs.
Revision 1.60 by greg, Mon Aug 26 10:14:21 1991 UTC

# Line 1 | Line 1
1 – # SCCSid "$SunId$ LBL"
2 –
1   #
2 + # SCCSid "$SunId$ LBL"
3   #  Compiles for ray tracing programs.
4   #
5  
6   OPT = -O -pipe
7   MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
8 < CFLAGS = $(MACH) $(OPT) -I../common
8 > CFLAGS = $(MACH) $(OPT) -I../common -L../lib
9   CC = cc
10   LINT = lint
11   LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
12   -DINCHAN -DRCONST -DREDEFW -DBIGLIB
13 + COMPAT = malloc.o
14  
15   #
16   # The following are user-definable:
# Line 28 | Line 28 | LIBDIR = /usr/local/lib/ray
28   #
29   # Library routines:
30   #
31 < LIBS = ../common/librt.a -lm
31 > LIBS = -lrt -lm
32  
33   #
34   # Device drivers for rview (see also devtable.c):
# Line 53 | Line 53 | RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS
53   RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC)
54  
55   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
56 <        $(MODOBJS) $(SUPPOBJS)
56 >        $(MODOBJS) $(SUPPOBJS) $(COMPAT)
57   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
58          $(MODSRC) $(SUPPSRC)
59  
# Line 65 | Line 65 | SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_fa
65   SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
66                  o_cone.c o_instance.c
67  
68 < MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o
69 < MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c
68 > MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o \
69 >        m_direct.o
70 > MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \
71 >        m_direct.c
72  
73   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
74   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
75  
76 < SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o
77 < SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c
76 > SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o
77 > SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c
78  
79   #
80   # What this makefile produces:
# Line 82 | Line 84 | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/
84  
85   all:    $(PROGS)
86  
87 < install:        $(PROGS)
87 > install:        $(PROGS) rayinit.cal
88          $(INSTALL) $(PROGS) $(INSTDIR)
89 +        rm -f $(LIBDIR)/rayinit.cal
90 +        cp rayinit.cal $(LIBDIR)
91  
92   sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
93  
# Line 91 | Line 95 | x10:   $(DEVDIR)/x10
95  
96   aed:    $(DEVDIR)/aed
97  
98 + tiff:  
99 +
100   clean:
101          set nonomatch; rm -f $(PROGS) *.o core
102  
# Line 144 | Line 150 | rvmain.o:      rmain.c
150          $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
151          mv rmain.o rvmain.o
152  
153 + readfargs.o:    readfargs.c ../common/object.h
154 +        $(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
155 +
156 + malloc.o:       malloc.c
157 +        $(CC) $(CFLAGS) -DMCOMP -c malloc.c
158 +
159   #
160   # Uncomment the following to model dispersion:
161   #
162 < #dielectric.o:  dielectric.c source.h
163 < #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
164 < #
162 > dielectric.o:   dielectric.c source.h
163 >        $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
164 >
165   # end of dispersion compiles.
166  
167   devcomm.o:      devcomm.c
# Line 186 | Line 198 | nwsdev.h:      nwsdev.cps newsconstants.h
198   aed.o colortab.o data.o devcomm.o \
199   devmain.o lookamb.o rview.o sundev.o x10.o x11.o:       ../common/color.h
200  
201 < o_cone.o srcsupp.o:     cone.h
201 > o_cone.o srcsupp.o:     ../common/cone.h
202  
203   data.o m_brdf.o mx_data.o p_data.o t_data.o:    data.h
204  

Diff Legend

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