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.42 by greg, Wed Dec 31 01:50:02 2003 UTC vs.
Revision 2.56 by greg, Tue Jun 24 02:01:21 2008 UTC

# Line 6 | Line 6
6   OPT = -O
7   MACH = -DBSD
8   CFLAGS = -I../common -L../lib $(OPT) $(MACH)
9 < SPECIAL = aed
9 > SPECIAL =
10   CC = cc
11   MLIB = -lm
12   LINT = lint
# 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 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.c 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  
101 – aed:    $(DEVDIR)/aed
102 –
102   ogl:    
103  
104   clean:
# Line 118 | Line 117 | $(DESTDIR)/rtrace:     $(RTOBJS) $(RLIB)
117   $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
118          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
119  
120 < $(DESTDIR)/rview:       $(RVOBJS) $(RLIB)
121 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
120 > $(DESTDIR)/rvu: $(RVOBJS) $(RLIB)
121 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
122  
123   $(DESTDIR)/lookamb:     lookamb.o ambio.o
124          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
125  
127 – $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o
128 –        $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
129 – devmain.o tty.o editline.o $(LIBS)
130 –
126   $(RLIB):        $(ROBJS) Version.o
127          ar rc $(RLIB) $(ROBJS) Version.o
128          -ranlib $(RLIB)
# Line 137 | Line 132 | $(RCLIB):      $(RLOBJS)
132          -ranlib $(RCLIB)
133  
134   #
140 – # Special compiles:
141 – #
142 –
143 – rtmain.o:       rtmain.c
144 –        $(CC) $(CFLAGS) -DNICE=4 -c rtmain.c
145 –
146 – rpmain.o:       rpmain.c
147 –        $(CC) $(CFLAGS) -DNICE=6 -c rpmain.c
148 –
149 – rvmain.o:       rvmain.c
150 –        $(CC) $(CFLAGS) -c rvmain.c
151 –
152 – #
135   # Uncomment the following to model dispersion:
136   #
137   dielectric.o:   dielectric.c source.h
# Line 160 | Line 142 | dielectric.o:  dielectric.c source.h
142   devcomm.o:      devcomm.c
143          $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
144  
163 – aed.o:  aed.c
164 –        $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
165 –
145   #
146   # Version module:
147   #
# Line 175 | Line 154 | Version.c:     VERSION $(RSRC) $(HEADERS)
154   # Include dependencies:
155   #
156  
157 < aed.o ambio.o colortab.o data.o devcomm.o \
157 > ambio.o colortab.o data.o devcomm.o \
158   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
159  
160   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
# Line 183 | Line 162 | freeobjmem.o o_cone.o srcsupp.o:       ../common/cone.h
162   data.o freeobjmem.o m_brdf.o mx_data.o \
163   p_data.o raycalls.o t_data.o:   data.h
164  
165 < aed.o devcomm.o devmain.o devtable.o \
166 < editline.o tty.o x11.o: driver.h
165 > devcomm.o devmain.o devtable.o \
166 > editline.o x11.o:       driver.h
167  
168   freeobjmem.o o_face.o srcsupp.o:        ../common/face.h
169  
170   ambient.o raytrace.o rpmain.o rtmain.o \
171 < rtrace.o rvmain.o rv2.o rv3.o source.o: ../common/octree.h
171 > rtrace.o rvmain.o rv2.o rv3.o:  ../common/octree.h
172  
173   o_instance.o:   ../common/instance.h
174  
175   ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
176   m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
177   raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
178 < virtuals.o:     ../common/otypes.h
178 > srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
179  
180 < ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \
181 < rtmain.o rpmain.o persist.o source.o rv3.o \
180 > ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \
181 > rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
182   srcsamp.o virtuals.o:   ../common/random.h
183  
184   ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
185   m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
186   mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
187   raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
188 < source.o sphere.o srcdraw.o srcsamp.o srcsupp.o t_data.o t_func.o text.o \
189 < rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:        ray.h \
188 > source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
189 > text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
190   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
191   ../common/rterror.h ../common/octree.h \
192   ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
# Line 215 | Line 194 | rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o:       ray.h
194   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
195  
196   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
197 < rpict.o rpmain.o rtmain.o rvmain.o \
198 < source.o srcdraw.o srcsamp.o srcsupp.o virtuals.o:      source.h
197 > rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
198 > srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
199  
200   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
201   duphead.o octree.o:     ../common/standard.h ../common/rtmisc.h \
# Line 225 | Line 204 | duphead.o octree.o:    ../common/standard.h ../common/rtm
204  
205   ambio.o:        ../common/fvect.h
206  
207 < initotypes.o raytrace.o:        otspecial.h
207 > initotypes.o srcobstr.o raytrace.o:     otspecial.h
208  
209   rpmain.o rtmain.o rvmain.o rpict.o \
210   srcdraw.o:      ../common/view.h ../common/resolu.h
# Line 245 | Line 224 | p_func.o t_data.o t_func.o:    func.h ../common/calcomp.h
224   preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
225   ../common/instance.h ../common/mesh.h ../common/color.h data.h
226  
227 < rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h
227 > rtmain.o rpmain.o rvmain.o persist.o duphead.o \
228 > renderopts.o rpict.o:   ../common/paths.h
229  
230   freeobjmem.o raycalls.o text.o: ../common/font.h
231  
# Line 254 | Line 234 | raypcalls.o:   ../common/selcall.h
234   o_mesh.o:       ../common/mesh.h
235  
236   noise3.o:       ../common/calcomp.h
237 +
238 + aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \
239 + m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
240 + mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
241 + o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
242 + srcobstr.o text.o:              rtotypes.h

Diff Legend

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