ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/Rmakefile
(Generate patch)

Comparing ray/src/cv/Rmakefile (file contents):
Revision 2.6 by greg, Wed Apr 13 14:08:53 1994 UTC vs.
Revision 2.7 by greg, Wed Jun 22 12:35:56 1994 UTC

# Line 18 | Line 18 | INSTDIR = /usr/local/bin
18  
19   LIBDIR = /usr/local/lib/ray
20  
21 < PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad
21 > PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad mgf2rad
22  
23   LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
24  
# Line 47 | Line 47 | nff2rad:       nff2rad.o
47   lampcolor:      lampcolor.o
48          $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
49  
50 < tmesh2rad:      tmesh2rad.o
51 <        $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o -lrt $(MLIB)
50 > tmesh2rad:      tmesh2rad.o tmesh.o
51 >        $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrt $(MLIB)
52  
53 < obj2rad:        obj2rad.o trans.o
54 <        $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o -lrt $(MLIB)
53 > obj2rad:        obj2rad.o trans.o tmesh.o
54 >        $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrt $(MLIB)
55  
56 + mgf2rad:        mgf2rad.o ../lib/libmgf.a
57 +        $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
58 +
59 + ../lib/libmgf.a:
60 +        cd mgflib ; \
61 +        make libmgf.a CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
62 +        mv libmgf.a ../../lib
63 +
64 + mgf2rad.o:      mgflib/parser.h tmesh.h
65 +
66   arch2rad.o trans.o:     trans.h
67  
68   ies2rad.o lampcolor.o:  ../common/color.h
69  
70   ies2rad.o:      ../common/paths.h
71  
72 < tmesh2rad.o:    ../common/standard.h ../common/mat4.h ../common/fvect.h
72 > obj2rad.o tmesh2rad.o:  tmesh.h \
73 > ../common/standard.h ../common/mat4.h ../common/fvect.h
74 >
75 > obj2rad.o:      trans.h
76 >
77 > tmesh.o:        tmesh.h ../common/fvect.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines