8 |
|
CFLAGS = $(MACH) $(OPT) -I../common -L../lib |
9 |
|
SPECIAL = aed |
10 |
|
CC = cc |
11 |
+ |
MLIB = -lm |
12 |
|
LINT = lint |
13 |
|
LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \ |
14 |
|
-DINCHAN -DRCONST -DREDEFW |
29 |
|
# |
30 |
|
# Library routines: |
31 |
|
# |
32 |
< |
LIBS = -lrt -lm |
32 |
> |
LIBS = -lrt $(MLIB) |
33 |
|
|
34 |
|
# |
35 |
|
# Device drivers for rview (see also devtable.c): |
44 |
|
# Standard object files: |
45 |
|
# |
46 |
|
|
47 |
< |
RTOBJS = rtmain.o rtrace.o $(ROBJS) Version.o |
47 |
> |
RTOBJS = rtmain.o rtrace.o duphead.o persist.o preload.o $(ROBJS) Version.o |
48 |
|
RTSRC = rmain.c rtrace.c $(RSRC) Version.c |
49 |
|
|
50 |
< |
RPOBJS = rpmain.o rpict.o $(ROBJS) Version.o |
50 |
> |
RPOBJS = rpmain.o rpict.o duphead.o persist.o preload.o $(ROBJS) Version.o |
51 |
|
RPSRC = rmain.c rpict.c $(RSRC) Version.c |
52 |
|
|
53 |
< |
RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS) $(ROBJS) Version.o |
54 |
< |
RVSRC = rmain.c rview.c rv2.c rv3.c $(DSRC) $(RSRC) Version.c |
53 |
> |
RVOBJS = rvmain.o rview.o rv2.o rv3.o freeobjmem.o $(DOBJS) $(ROBJS) Version.o |
54 |
> |
RVSRC = rmain.c rview.c rv2.c rv3.c freeobjmem.c $(DSRC) $(RSRC) Version.c |
55 |
|
|
56 |
|
ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \ |
57 |
|
$(MODOBJS) $(SUPPOBJS) |
67 |
|
srcsamp.c o_cone.c o_instance.c |
68 |
|
|
69 |
|
MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \ |
70 |
< |
m_mirror.o m_direct.o |
71 |
< |
MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf.c m_mirror.c \ |
72 |
< |
m_direct.c |
70 |
> |
m_mirror.o m_direct.o m_mist.o fprism.o |
71 |
> |
MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \ |
72 |
> |
m_mirror.c m_direct.c m_mist.c fprism.c |
73 |
|
|
74 |
|
MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o |
75 |
|
MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c |
76 |
|
|
77 |
< |
SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o \ |
78 |
< |
malloc.o |
79 |
< |
SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c \ |
80 |
< |
malloc.c |
77 |
> |
SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o malloc.o data.o \ |
78 |
> |
readfargs.o |
79 |
> |
SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c malloc.c \ |
80 |
> |
readfargs.c |
81 |
|
|
82 |
|
HEADERS = ambient.h ray.h data.h otspecial.h source.h |
83 |
|
|
150 |
|
# |
151 |
|
|
152 |
|
rtmain.o: rmain.c |
153 |
< |
$(CC) $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c |
153 |
> |
$(CC) $(CFLAGS) -DRTRACE -DNICE=4 -c rmain.c |
154 |
|
mv rmain.o rtmain.o |
155 |
|
|
156 |
|
rpmain.o: rmain.c |
157 |
< |
$(CC) $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c |
157 |
> |
$(CC) $(CFLAGS) -DRPICT -DNICE=6 -c rmain.c |
158 |
|
mv rmain.o rpmain.o |
159 |
|
|
160 |
|
rvmain.o: rmain.c |
161 |
< |
$(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c |
161 |
> |
$(CC) $(CFLAGS) -DRVIEW -c rmain.c |
162 |
|
mv rmain.o rvmain.o |
163 |
|
|
164 |
|
readfargs.o: readfargs.c ../common/object.h |
228 |
|
|
229 |
|
o_instance.o: ../common/instance.h ../common/octree.h |
230 |
|
|
231 |
< |
ambient.o aniso.o dielectric.o func.o initotypes.o m_brdf.o \ |
232 |
< |
normal.o o_cone.o text.o raytrace.o rtrace.o \ |
233 |
< |
rv2.o source.o srcsupp.o virtuals.o sphere.o: ../common/otypes.h |
231 |
> |
ambient.c aniso.c dielectric.c freeobjmem.c func.c initotypes.c \ |
232 |
> |
m_brdf.c m_direct.c m_mirror.c normal.c o_cone.c preload.c \ |
233 |
> |
raytrace.c rtrace.c rv2.c source.c sphere.c srcsupp.c text.c \ |
234 |
> |
virtuals.c: ../common/otypes.h |
235 |
|
|
236 |
|
ambient.o ambcomp.o aniso.o normal.o rpict.o \ |
237 |
< |
rv3.o srcsamp.o virtuals.o: ../common/random.h |
237 |
> |
source.o rv3.o srcsamp.o virtuals.o: ../common/random.h |
238 |
|
|
239 |
|
ambient.o ambcomp.o aniso.o dielectric.o func.o glass.o m_clip.o m_mirror.o \ |
240 |
|
m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \ |
241 |
|
p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \ |
242 |
|
rtrace.o rview.o rv2.o rv3.o source.o srcsamp.o srcsupp.o virtuals.o \ |
243 |
< |
sphere.o t_data.o t_func.o: ray.h ../common/standard.h \ |
243 |
> |
sphere.o m_mist.o t_data.o t_func.o persist.o: ray.h ../common/standard.h \ |
244 |
|
../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h |
245 |
|
|
246 |
|
rv2.o rv3.o rview.o: rpaint.h driver.h ../common/view.h |
247 |
|
|
248 |
< |
m_direct.o m_mirror.o \ |
248 |
> |
m_direct.o m_mirror.o m_mist.o dielectric.o \ |
249 |
|
source.o srcsamp.o srcsupp.o virtuals.o: source.h |
250 |
|
|
251 |
< |
cone.o data.o devcomm.o initotypes.o \ |
252 |
< |
octree.o: ../common/standard.h ../common/mat4.h ../common/fvect.h |
251 |
> |
cone.o data.o devcomm.o freeobjmem.o initotypes.o fprism.o \ |
252 |
> |
duphead.o octree.o: ../common/standard.h ../common/mat4.h ../common/fvect.h |
253 |
|
|
254 |
|
initotypes.o raytrace.o: otspecial.h |
255 |
|
|
270 |
|
aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \ |
271 |
|
p_func.o t_data.o t_func.o: func.h |
272 |
|
|
273 |
+ |
freeobjmem.o: ../common/object.h |
274 |
+ |
|
275 |
|
devcomm.o: ../common/vfork.h |
276 |
|
|
277 |
< |
rtmain.o rpmain.o rvmain.o: ../common/paths.h |
277 |
> |
rtmain.o rpmain.o rvmain.o persist.o duphead.o rpict.o: ../common/paths.h |