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 2.49 by greg, Fri Nov 5 03:31:38 2004 UTC vs.
Revision 2.62 by greg, Fri Feb 18 00:40:25 2011 UTC

# Line 30 | Line 30 | LIBDIR = /usr/local/lib/ray
30   #
31   RLIB = ../lib/libradiance.a
32   RCLIB = ../lib/libraycalls.a
33 < LIBS = -lrt $(MLIB)
33 > LIBS = -lrtrad $(MLIB)
34  
35   #
36   # Device drivers for rvu (see also devtable.c):
# Line 54 | Line 54 | RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
54   RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
55   RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
56  
57 < RLOBJS = raycalls.o raypcalls.o
58 < RLSRC = raycalls.c raypcalls.c
57 > RLOBJS = raycalls.o raypcalls.o rayfifo.o
58 > RLSRC = raycalls.c raypcalls.c rayfifo.c
59  
60   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
61          $(MODOBJS) $(SUPPOBJS)
# Line 73 | Line 73 | SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa
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
76 >        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o
77   MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
78 <        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c
78 >        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c
79  
80   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
81   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
# Line 111 | Line 111 | lint:  $(RVSRC)
111   # Links:
112   #
113  
114 < $(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB)
115 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS)
114 > $(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB)
115 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS)
116  
117   $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
118          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
119  
120 < $(DESTDIR)/rvu: $(RVOBJS) $(RLIB)
121 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
120 > $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB)
121 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
122 > $(RLIB) $(LIBS) $(DLIBS)
123  
124   $(DESTDIR)/lookamb:     lookamb.o ambio.o
125          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
126  
127   $(RLIB):        $(ROBJS) Version.o
128 +        rm -f $(RLIB)
129          ar rc $(RLIB) $(ROBJS) Version.o
130          -ranlib $(RLIB)
131  
132   $(RCLIB):       $(RLOBJS)
133 +        rm -f $(RCLIB)
134          ar rc $(RCLIB) $(RLOBJS)
135          -ranlib $(RCLIB)
136  
137   #
135 # Special compiles:
136 #
137
138 rtmain.o:       rtmain.c
139        $(CC) $(CFLAGS) -DNICE=4 -c rtmain.c
140
141 rpmain.o:       rpmain.c
142        $(CC) $(CFLAGS) -DNICE=6 -c rpmain.c
143
144 rvmain.o:       rvmain.c
145        $(CC) $(CFLAGS) -c rvmain.c
146
147 #
138   # Uncomment the following to model dispersion:
139   #
140   dielectric.o:   dielectric.c source.h
# Line 190 | Line 180 | m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o prelo
180   raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
181   srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
182  
183 < ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \
184 < rtmain.o rpmain.o persist.o source.o rv3.o \
183 > ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \
184 > rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
185   srcsamp.o virtuals.o:   ../common/random.h
186  
187 < ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
187 > ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.o \
188   m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
189   mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
190 < raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
190 > raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
191   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
192   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
193   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
194 < ../common/rterror.h ../common/octree.h ../common/tifftypes.h \
194 > ../common/rterror.h ../common/octree.h \
195   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
196  
197   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
198  
199   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
200 < rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
200 > rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
201   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
202  
203   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
204   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
205 < ../common/rtio.h ../common/rtmath.h ../common/tifftypes.h \
205 > ../common/rtio.h ../common/rtmath.h \
206   ../common/rterror.h ../common/mat4.h ../common/fvect.h
207  
208   ambio.o:        ../common/fvect.h
# Line 247 | Line 237 | raypcalls.o:   ../common/selcall.h
237   o_mesh.o:       ../common/mesh.h
238  
239   noise3.o:       ../common/calcomp.h
240 +
241 + aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \
242 + m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
243 + mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
244 + o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
245 + srcobstr.o text.o:              rtotypes.h
246 +
247 + m_bsdf.o:       ambient.h source.h func.h \
248 + ../common/calcomp.h ../common/paths.h ../common/bsdf.h ../common/random.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines