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.43 by greg, Wed Dec 31 19:38:27 2003 UTC vs.
Revision 2.65 by greg, Thu Jun 14 22:42:21 2012 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 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 > RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o
58 > RCSRC = rcmain.c rcontrib.c rc2.c rc3.c
59  
60 + RLOBJS = raycalls.o raypcalls.o rayfifo.o
61 + RLSRC = raycalls.c raypcalls.c rayfifo.c
62 +
63   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
64          $(MODOBJS) $(SUPPOBJS)
65   RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
# Line 69 | Line 72 | RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c init
72  
73   SURFOBJS = source.o sphere.o srcobstr.o srcsupp.o srcsamp.o virtuals.o \
74          o_face.o o_cone.o o_instance.o o_mesh.o
75 < SURFSRC = sphere.c source.c srcobstr.o srcsupp.c srcsamp.c virtuals.c \
75 > SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsamp.c virtuals.c \
76          o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c
77  
78   MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
79 <        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o
79 >        m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o
80   MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
81 <        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c
81 >        m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c
82  
83   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
84   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
# Line 89 | Line 92 | HEADERS = ambient.h ray.h data.h otspecial.h source.h
92   # What this makefile produces:
93   #
94  
95 < PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
95 > PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
96 > $(DESTDIR)/lookamb
97  
98   all:    $(PROGS) $(RCLIB) $(SPECIAL)
99  
100   install:        all rayinit.cal
101          $(INSTALL) $(PROGS) $(INSTDIR)
102 +        cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
103 +        cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
104          rm -f $(LIBDIR)/rayinit.cal
105          cp rayinit.cal $(LIBDIR)
106  
101 – aed:    $(DEVDIR)/aed
102 –
107   ogl:    
108  
109   clean:
# Line 112 | Line 116 | lint:  $(RVSRC)
116   # Links:
117   #
118  
119 < $(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB)
120 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS)
119 > $(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB)
120 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS)
121  
122   $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
123          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
124  
125 < $(DESTDIR)/rview:       $(RVOBJS) $(RLIB)
126 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
125 > $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB)
126 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
127 > $(RLIB) $(LIBS) $(DLIBS)
128  
129 + $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
130 +        $(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
131 +
132   $(DESTDIR)/lookamb:     lookamb.o ambio.o
133          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
134  
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 –
135   $(RLIB):        $(ROBJS) Version.o
136 +        rm -f $(RLIB)
137          ar rc $(RLIB) $(ROBJS) Version.o
138          -ranlib $(RLIB)
139  
140   $(RCLIB):       $(RLOBJS)
141 +        rm -f $(RCLIB)
142          ar rc $(RCLIB) $(RLOBJS)
143          -ranlib $(RCLIB)
144  
145   #
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 – #
146   # Uncomment the following to model dispersion:
147   #
148   dielectric.o:   dielectric.c source.h
# Line 160 | Line 153 | dielectric.o:  dielectric.c source.h
153   devcomm.o:      devcomm.c
154          $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
155  
163 – aed.o:  aed.c
164 –        $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
165 –
156   #
157   # Version module:
158   #
# Line 175 | Line 165 | Version.c:     VERSION $(RSRC) $(HEADERS)
165   # Include dependencies:
166   #
167  
168 < aed.o ambio.o colortab.o data.o devcomm.o \
168 > ambio.o colortab.o data.o devcomm.o \
169   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
170  
171   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
# Line 183 | Line 173 | freeobjmem.o o_cone.o srcsupp.o:       ../common/cone.h
173   data.o freeobjmem.o m_brdf.o mx_data.o \
174   p_data.o raycalls.o t_data.o:   data.h
175  
176 < aed.o devcomm.o devmain.o devtable.o \
177 < editline.o tty.o x11.o: driver.h
176 > devcomm.o devmain.o devtable.o \
177 > editline.o x11.o:       driver.h
178  
179   freeobjmem.o o_face.o srcsupp.o:        ../common/face.h
180  
# Line 196 | Line 186 | o_instance.o:  ../common/instance.h
186   ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o initotypes.o \
187   m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o preload.o \
188   raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
189 < srcobstr.o virtuals.o:  ../common/otypes.h
189 > srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
190  
191 < ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \
192 < rtmain.o rpmain.o persist.o source.o rv3.o \
191 > ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \
192 > rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
193   srcsamp.o virtuals.o:   ../common/random.h
194  
195 < ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
195 > ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o m_bsdf.o \
196   m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
197   mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
198 < raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
198 > raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
199   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
200   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
201   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
# Line 215 | Line 205 | text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o
205   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
206  
207   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
208 < rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
208 > rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
209   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
210  
211   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
# Line 242 | Line 232 | rv2.o: ../common/resolu.h
232   aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
233   p_func.o t_data.o t_func.o:     func.h ../common/calcomp.h
234  
235 < preload.o:      ../common/object.h ../common/face.h ../common/cone.h \
236 < ../common/instance.h ../common/mesh.h ../common/color.h data.h
235 > preload.o:      data.h func.h ../common/object.h ../common/face.h \
236 > ../common/cone.h ../common/instance.h ../common/mesh.h \
237 > ../common/color.h ../common/bsdf.h ../common/otypes.h
238  
239 < rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h
239 > rtmain.o rpmain.o rvmain.o persist.o duphead.o \
240 > renderopts.o rpict.o:   ../common/paths.h
241  
242   freeobjmem.o raycalls.o text.o: ../common/font.h
243  
# Line 254 | Line 246 | raypcalls.o:   ../common/selcall.h
246   o_mesh.o:       ../common/mesh.h
247  
248   noise3.o:       ../common/calcomp.h
249 +
250 + aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \
251 + m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
252 + mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
253 + o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
254 + srcobstr.o text.o:              rtotypes.h
255 +
256 + m_bsdf.o:       ambient.h source.h func.h \
257 + ../common/calcomp.h ../common/bsdf.h ../common/random.h

Diff Legend

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