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 2.40 by greg, Mon Nov 10 16:52:24 2003 UTC vs.
Revision 2.45 by greg, Tue Mar 30 20:40:04 2004 UTC

# Line 33 | Line 33 | RCLIB = ../lib/libraycalls.a
33   LIBS = -lrt $(MLIB)
34  
35   #
36 < # Device drivers for rview (see also devtable.c):
36 > # Device drivers for rvu (see also devtable.c):
37   #
38   DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
39          colortab.o
# Line 67 | Line 67 | RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o ini
67   RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c initotypes.c \
68          preload.c raytrace.c renderopts.c
69  
70 < SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
71 <        o_cone.o o_instance.o o_mesh.o
72 < SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
73 <        srcsamp.c o_cone.c o_instance.c o_mesh.c
70 > SURFOBJS = source.o sphere.o srcobstr.o srcsupp.o srcsamp.o virtuals.o \
71 >        o_face.o o_cone.o o_instance.o o_mesh.o
72 > SURFSRC = sphere.c source.c srcobstr.o srcsupp.c srcsamp.c virtuals.c \
73 >        o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c
74  
75   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
76          m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o
# Line 89 | Line 89 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
89   # What this makefile produces:
90   #
91  
92 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
92 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/lookamb
93  
94   all:    $(PROGS) $(RCLIB) $(SPECIAL)
95  
96   install:        all rayinit.cal
97          $(INSTALL) $(PROGS) $(INSTDIR)
98 +        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
99          rm -f $(LIBDIR)/rayinit.cal
100          cp rayinit.cal $(LIBDIR)
101  
# Line 118 | Line 119 | $(DESTDIR)/rtrace:     $(RTOBJS) $(RLIB)
119   $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
120          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
121  
122 < $(DESTDIR)/rview:       $(RVOBJS) $(RLIB)
123 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
122 > $(DESTDIR)/rvu: $(RVOBJS) $(RLIB)
123 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
124  
125   $(DESTDIR)/lookamb:     lookamb.o ambio.o
126          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
# Line 189 | Line 190 | editline.o tty.o x11.o:        driver.h
190   freeobjmem.o o_face.o srcsupp.o:        ../common/face.h
191  
192   ambient.o raytrace.o rpmain.o rtmain.o \
193 < rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
193 > rtrace.o rvmain.o rv2.o rv3.o:  ../common/octree.h
194  
195   o_instance.o:   ../common/instance.h
196  
197   ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
198   m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
199   raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
200 < virtuals.o:     ../common/otypes.h
200 > srcobstr.o virtuals.o:  ../common/otypes.h
201  
202   ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \
203   rtmain.o rpmain.o persist.o source.o rv3.o \
# Line 206 | Line 207 | ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o
207   m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
208   mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
209   raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
210 < source.o sphere.o srcdraw.o srcsamp.o srcsupp.o t_data.o t_func.o text.o \
211 < rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:        ray.h \
210 > source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
211 > text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
212   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
213   ../common/rterror.h ../common/octree.h \
214   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 215 | Line 216 | rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:       ray.h
216   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
217  
218   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
219 < source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:      source.h
219 > rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
220 > srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
221  
222   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
223   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
# Line 224 | Line 226 | duphead.o octree.o:    ../common/standard.h ../common/rtm
226  
227   ambio.o:        ../common/fvect.h
228  
229 < initotypes.o raytrace.o:        otspecial.h
229 > initotypes.o srcobstr.o raytrace.o:     otspecial.h
230  
231   rpmain.o rtmain.o rvmain.o rpict.o \
232   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 244 | Line 246 | p_func.o t_data.o t_func.o:    func.h ../common/calcomp.h
246   preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
247   ../common/instance.h ../common/mesh.h ../common/color.h data.h
248  
249 < devcomm.o:      ../common/paths.h
250 <
249 < rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h
249 > rtmain.o rpmain.o rvmain.o persist.o duphead.o \
250 > renderopts.o rpict.o:   ../common/paths.h
251  
252   freeobjmem.o raycalls.o text.o: ../common/font.h
253  

Diff Legend

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