]> git.pld-linux.org Git - packages/Radiance.git/blame - Radiance-PLD.patch
projects / packages / Radiance.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- cleanups
[packages/Radiance.git] / Radiance-PLD.patch
CommitLineData
196b4671 1diff -ur ray.orig/src/cal/calc/Makefile ray/src/cal/calc/Makefile
2--- ray.orig/src/cal/calc/Makefile Fri Dec 10 02:24:21 1993
3+++ ray/src/cal/calc/Makefile Sun Jun 17 17:16:16 2001
4@@ -24,7 +24,7 @@
5 caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
6
7 install: calc
8- cp calc $(INSTDIR)
754b842b 9+ install calc $(DESTDIR)$(INSTDIR)
196b4671 10
11 clean:
12 set nonomatch; rm -f *.o calc
13diff -ur ray.orig/src/cal/calc/Rmakefile ray/src/cal/calc/Rmakefile
14--- ray.orig/src/cal/calc/Rmakefile Fri Dec 10 02:24:21 1993
15+++ ray/src/cal/calc/Rmakefile Sun Jun 17 17:16:16 2001
16@@ -24,7 +24,7 @@
17 caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
18
19 install: calc
20- cp calc $(INSTDIR)
754b842b 21+ install calc $(DESTDIR)$(INSTDIR)
196b4671 22
23 clean:
24 set nonomatch; rm -f *.o calc
25diff -ur ray.orig/src/cal/ev/Makefile ray/src/cal/ev/Makefile
26--- ray.orig/src/cal/ev/Makefile Fri Dec 10 02:24:58 1993
27+++ ray/src/cal/ev/Makefile Sun Jun 17 17:16:16 2001
28@@ -21,7 +21,7 @@
29 calfunc.o ealloc.o savestr.o $(MLIB)
30
31 install: ev
32- cp ev $(INSTDIR)
754b842b 33+ install ev $(DESTDIR)$(INSTDIR)
196b4671 34
35 clean:
36 set nonomatch; rm -f *.o ev
37diff -ur ray.orig/src/cal/ev/Rmakefile ray/src/cal/ev/Rmakefile
38--- ray.orig/src/cal/ev/Rmakefile Fri Dec 10 02:24:58 1993
39+++ ray/src/cal/ev/Rmakefile Sun Jun 17 17:16:16 2001
40@@ -21,7 +21,7 @@
41 calfunc.o ealloc.o savestr.o $(MLIB)
42
43 install: ev
44- cp ev $(INSTDIR)
754b842b 45+ install ev $(DESTDIR)$(INSTDIR)
196b4671 46
47 clean:
48 set nonomatch; rm -f *.o ev
49diff -ur ray.orig/src/cal/rcalc/Makefile ray/src/cal/rcalc/Makefile
50--- ray.orig/src/cal/rcalc/Makefile Fri Dec 10 02:24:36 1993
51+++ ray/src/cal/rcalc/Makefile Sun Jun 17 17:16:16 2001
52@@ -24,7 +24,7 @@
53 caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
54
55 install: rcalc
56- cp rcalc $(INSTDIR)
754b842b 57+ install rcalc $(DESTDIR)$(INSTDIR)
196b4671 58
59 clean:
60 set nonomatch; rm -f *.o rcalc
61diff -ur ray.orig/src/cal/rcalc/Rmakefile ray/src/cal/rcalc/Rmakefile
62--- ray.orig/src/cal/rcalc/Rmakefile Fri Dec 10 02:24:36 1993
63+++ ray/src/cal/rcalc/Rmakefile Sun Jun 17 17:16:16 2001
64@@ -24,7 +24,7 @@
65 caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
66
67 install: rcalc
68- cp rcalc $(INSTDIR)
754b842b 69+ install rcalc $(DESTDIR)$(INSTDIR)
196b4671 70
71 clean:
72 set nonomatch; rm -f *.o rcalc
73diff -ur ray.orig/src/cal/util/Makefile ray/src/cal/util/Makefile
74--- ray.orig/src/cal/util/Makefile Fri Sep 6 05:47:47 1996
75+++ ray/src/cal/util/Makefile Sun Jun 17 17:16:16 2001
76@@ -17,7 +17,7 @@
77 all: $(PROGS)
78
79 install: $(PROGS)
80- cp $(PROGS) $(INSTDIR)
754b842b 81+ install $(PROGS) $(DESTDIR)$(INSTDIR)
196b4671 82
83 clean:
84 set nonomatch; rm -f *.o $(PROGS)
85diff -ur ray.orig/src/cal/util/Rmakefile ray/src/cal/util/Rmakefile
86--- ray.orig/src/cal/util/Rmakefile Wed Jan 28 01:59:42 1998
87+++ ray/src/cal/util/Rmakefile Sun Jun 17 17:16:16 2001
88@@ -19,7 +19,7 @@
89 all: $(PROGS)
90
91 install: $(PROGS)
92- cp $(PROGS) $(INSTDIR)
754b842b 93+ install $(PROGS) $(DESTDIR)$(INSTDIR)
196b4671 94
95 clean:
96 set nonomatch; rm -f *.o $(PROGS)
97diff -ur ray.orig/src/common/Rmakefile ray/src/common/Rmakefile
98--- ray.orig/src/common/Rmakefile Wed Apr 16 01:53:33 1997
99+++ ray/src/common/Rmakefile Sun Jun 17 17:16:16 2001
754b842b
JB		 100@@ -30,9 +30,10 @@
101 librt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
102 ar rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
196b4671 103 -ranlib librt.a
754b842b 104+ cp librt.a ../lib/librayt.a
196b4671 105
106 install: librt.a
107- mv librt.a ../lib/librt.a
108+ mv librt.a ../lib/librayt.a
109
110 clean:
111 rm -f *.o librt.a
112diff -ur ray.orig/src/common/error.c ray/src/common/error.c
113--- ray.orig/src/common/error.c Sat Apr 6 01:48:19 1996
114+++ ray/src/common/error.c Sun Jun 17 17:16:16 2001
115@@ -10,7 +10,9 @@
116
117 #include "standard.h"
118
119+#ifndef linux
120 extern char *sys_errlist[]; /* system error list */
121+#endif
122 extern int sys_nerr; /* number of system errors */
123
124 char errmsg[512]; /* global error message buffer */
125diff -ur ray.orig/src/common/lookup.h ray/src/common/lookup.h
126--- ray.orig/src/common/lookup.h Wed Jan 28 01:59:42 1998
127+++ ray/src/common/lookup.h Sun Jun 17 17:16:16 2001
128@@ -5,6 +5,7 @@
129 /*
130 * Header file for general associative table lookup routines
131 */
132+#include <string.h>
133
134 typedef struct {
135 char *key; /* key name */
754b842b 136@@ -73,4 +74,3 @@
196b4671 137 extern void lu_done();
138 extern long lu_shash();
139
140-extern int strcmp();
196b4671 141diff -ur ray.orig/src/cv/Rmakefile ray/src/cv/Rmakefile
142--- ray.orig/src/cv/Rmakefile Fri Jan 19 18:47:36 1996
143+++ ray/src/cv/Rmakefile Sun Jun 17 17:16:16 2001
754b842b
JB		 144@@ -22,12 +22,14 @@
145
146 LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
147
148+MGF_LIB = ../lib/libmgf.a
149+
196b4671 150 all: $(PROGS)
151
152 install: $(PROGS) $(LIBFILES)
153- cp $(PROGS) $(INSTDIR)
154- cd $(LIBDIR) ; rm -f $(LIBFILES)
155- cp $(LIBFILES) $(LIBDIR)
754b842b 156+ install $(PROGS) $(DESTDIR)$(INSTDIR)
196b4671 157+ cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
754b842b 158+ install $(LIBFILES) $(DESTDIR)$(LIBDIR)
196b4671 159
160 clean:
161 set nonomatch; rm -f $(PROGS) *.o core
754b842b 162@@ -37,31 +39,31 @@
196b4671 163 $(CC) $(CFLAGS) -o thf2rad thf2rad.o
164
165 ies2rad: ies2rad.o
166- $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt -lm
167+ $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrayt -lm
168
169 arch2rad: arch2rad.o trans.o
170- $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrt
171+ $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrayt
172
173 nff2rad: nff2rad.o
174 $(CC) $(CFLAGS) -o nff2rad nff2rad.o
175
176 lampcolor: lampcolor.o
177- $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
178+ $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrayt
179
180 tmesh2rad: tmesh2rad.o tmesh.o
181- $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrt $(MLIB)
182+ $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrayt $(MLIB)
183
184 obj2rad: obj2rad.o trans.o tmesh.o
185- $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrt $(MLIB)
186+ $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrayt $(MLIB)
187
754b842b 188-mgf2rad: MGF_LIB mgf2rad.o tmesh.o
196b4671 189- $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
754b842b 190+mgf2rad: $(MGF_LIB) mgf2rad.o tmesh.o
196b4671 191+ $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrayt $(MLIB)
192
193 rad2mgf: rad2mgf.o
194- $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrt $(MLIB)
195+ $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrayt $(MLIB)
196
754b842b 197-mgf2meta: MGF_LIB mgf2meta.o
196b4671 198- $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrt $(MLIB)
754b842b 199+mgf2meta: $(MGF_LIB) mgf2meta.o
196b4671 200+ $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrayt $(MLIB)
201
202 mgfilt:
203 cd mgflib ; rm -f mgfilt ; \
754b842b
JB		 204@@ -75,7 +77,7 @@
205 CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
206 mv mgf2inv ..
207
208-MGF_LIB:
209+$(MGF_LIB):
210 cd mgflib ; rm -f libmgf.a ; \
211 make libmgf.a CC=$(CC) \
212 CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
196b4671 213diff -ur ray.orig/src/cv/mgf2rad.c ray/src/cv/mgf2rad.c
214--- ray.orig/src/cv/mgf2rad.c Wed Jul 24 22:07:53 1996
215+++ ray/src/cv/mgf2rad.c Sun Jun 17 17:20:06 2001
216@@ -23,7 +23,7 @@
217
218 double emult = 1.; /* emitter multiplier */
219
220-FILE *matfp = stdout; /* material output file */
221+FILE *matfp;// = stdout; /* material output file */
222
223 int r_comment(), r_cone(), r_cyl(), r_face(), r_ies(), r_ring(), r_sph();
224 char *material(), *object(), *addarg();
225@@ -34,6 +34,8 @@
226 char *argv[];
227 {
228 int i;
229+ matfp=stdout;
230+
231 /* print out parser version */
232 printf("## Translated from MGF Version %d.%d\n", MG_VMAJOR, MG_VMINOR);
233 /* initialize dispatch table */
234diff -ur ray.orig/src/gen/Rmakefile ray/src/gen/Rmakefile
235--- ray.orig/src/gen/Rmakefile Tue Mar 19 21:37:46 1996
236+++ ray/src/gen/Rmakefile Sun Jun 17 17:16:16 2001
237@@ -22,9 +22,9 @@
238 all: $(PROGS)
239
240 install: $(PROGS) $(LIBFILES)
241- cp $(PROGS) $(INSTDIR)
242- cd $(LIBDIR) ; rm -f $(LIBFILES)
243- cp $(LIBFILES) $(LIBDIR)
754b842b 244+ install $(PROGS) $(DESTDIR)$(INSTDIR)
196b4671 245+ cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
754b842b 246+ install $(LIBFILES) $(DESTDIR)$(LIBDIR)
196b4671 247
248 clean:
249 set nonomatch; rm -f $(PROGS) *.o core
250@@ -48,22 +48,22 @@
251 $(CC) $(CFLAGS) -o genprism genprism.o $(MLIB)
252
253 xform: xform.o
254- $(CC) $(CFLAGS) -o xform xform.o -lrt $(MLIB)
255+ $(CC) $(CFLAGS) -o xform xform.o -lrayt $(MLIB)
256
257 replmarks: replmarks.o
258- $(CC) $(CFLAGS) -o replmarks replmarks.o -lrt $(MLIB)
259+ $(CC) $(CFLAGS) -o replmarks replmarks.o -lrayt $(MLIB)
260
261 mkillum: mkillum.o mkillum2.o mkillum3.o
262- $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrt $(MLIB)
263+ $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrayt $(MLIB)
264
265 genrev: genrev.o
266- $(CC) $(CFLAGS) -o genrev genrev.o -lrt $(MLIB)
267+ $(CC) $(CFLAGS) -o genrev genrev.o -lrayt $(MLIB)
268
269 genworm: genworm.o
270- $(CC) $(CFLAGS) -o genworm genworm.o -lrt $(MLIB)
271+ $(CC) $(CFLAGS) -o genworm genworm.o -lrayt $(MLIB)
272
273 gensurf: gensurf.o
274- $(CC) $(CFLAGS) -o gensurf gensurf.o -lrt $(MLIB)
275+ $(CC) $(CFLAGS) -o gensurf gensurf.o -lrayt $(MLIB)
276
277 genclock: genclock.o
278 $(CC) $(CFLAGS) -o genclock genclock.o $(MLIB)
279diff -ur ray.orig/src/meta/Rmakefile ray/src/meta/Rmakefile
280--- ray.orig/src/meta/Rmakefile Fri Dec 10 02:24:07 1993
281+++ ray/src/meta/Rmakefile Sun Jun 17 17:16:16 2001
754b842b
JB		 282@@ -24,160 +24,121 @@
283
284 common = $(io) syscalls.o misc.o savestr.o wputs.o eputs.o quit.o $(COMPAT)
285
286-install: general
287+PROGS = mx80 meta2tga t4014 pexpand psort cv psmeta plotin imagew impress x11meta \
288+ bgraph igraph dgraph igraph dgraph gcomp aed5 plot4
289+
290+PROGS2 = mt160l mt160 mtext plotout xmeta okimate tbar
291+
292+all: $(common) ../lib/libmeta.a $(PROGS)
293+
294+install: $(PROGS)
295+ install $(PROGS) $(DESTDIR)$(INSTDIR)
296
196b4671 297 clean:
298 set nonomatch; rm -f *.o a.out core
299
300-general: $(INSTDIR)/mx80 $(INSTDIR)/meta2tga \
301-$(INSTDIR)/t4014 $(INSTDIR)/pexpand $(INSTDIR)/psort \
302-$(INSTDIR)/cv $(INSTDIR)/psmeta $(EXEC2)/plotin \
303-$(INSTDIR)/imagew $(INSTDIR)/impress $(INSTDIR)/x11meta \
304-../lib/libmeta.a $(INSTDIR)/bgraph $(INSTDIR)/igraph \
305-$(INSTDIR)/dgraph $(INSTDIR)/gcomp $(INSTDIR)/aed5 $(INSTDIR)/plot4
754b842b
JB		 306-
307-special: $(EXEC2)/mt160l $(EXEC2)/mt160 $(EXEC2)/mtext \
308-$(EXEC2)/plotout $(EXEC2)/xmeta $(EXEC2)/okimate $(EXEC2)/tbar
309-
196b4671 310-$(INSTDIR)/meta2tga $(EXEC2)/okimate $(INSTDIR)/impress \
311-$(INSTDIR)/mx80 $(INSTDIR)/t4014 $(INSTDIR)/plotout $(INSTDIR)/x11meta \
312-$(EXEC2)/mt160l $(EXEC2)/mt160 $(INSTDIR)/pexpand $(INSTDIR)/plot4 \
313-$(INSTDIR)/psort $(INSTDIR)/imagew $(INSTDIR)/tcurve $(EXEC2)/mtext \
314-$(INSTDIR)/tscat $(INSTDIR)/plotin $(INSTDIR)/tbar $(INSTDIR)/xmeta \
315-../lib/libmeta.a $(INSTDIR)/aed5 $(INSTDIR)/psmeta: $(common)
754b842b 316-
196b4671 317-$(EXEC2)/mt160l: mt160l.o mplot.o plot.o palloc.o
318- $(CC) $(CFLAGS) -o $(EXEC2)/mt160l mt160l.o mplot.o plot.o \
754b842b
JB		 319-$(common) palloc.o
320-
196b4671 321-$(EXEC2)/okimate: okimate.o mplot.o plot.o palloc.o
322- $(CC) $(CFLAGS) -o $(EXEC2)/okimate okimate.o mplot.o plot.o \
754b842b
JB		 323-$(common) palloc.o
324+mt160l: mt160l.o mplot.o plot.o palloc.o
325+ $(CC) $(CFLAGS) -o mt160l mt160l.o mplot.o plot.o \
326+ $(common) palloc.o
327+
328+okimate: okimate.o mplot.o plot.o palloc.o
329+ $(CC) $(CFLAGS) -o okimate okimate.o mplot.o plot.o \
330+ $(common) palloc.o
196b4671 331
332-$(INSTDIR)/imagew: imagew.o mplot.o plot.o palloc.o
754b842b 333+imagew: imagew.o mplot.o plot.o palloc.o
196b4671 334 $(CC) $(CFLAGS) imagew.o mplot.o plot.o $(common) \
335-palloc.o $(MLIB)
336- cp a.out $(INSTDIR)/imagew
754b842b 337+ palloc.o $(MLIB) -o imagew
196b4671 338
339-$(EXEC2)/mt160: mt160.o mplot.o plot.o palloc.o
340- $(CC) $(CFLAGS) -o $(EXEC2)/mt160 mt160.o mplot.o plot.o $(common) \
754b842b
JB		 341-palloc.o
342+mt160: mt160.o mplot.o plot.o palloc.o
343+ $(CC) $(CFLAGS) -o mt160 mt160.o mplot.o plot.o $(common) palloc.o
196b4671 344
345-$(INSTDIR)/meta2tga: meta2tga.o rplot.o plot.o palloc.o
754b842b 346+meta2tga: meta2tga.o rplot.o plot.o palloc.o
196b4671 347 $(CC) $(CFLAGS) meta2tga.o rplot.o plot.o $(common) \
348-palloc.o $(MLIB)
349- cp a.out $(INSTDIR)/meta2tga
754b842b 350+ palloc.o $(MLIB) -o meta2tga
196b4671 351
352-$(INSTDIR)/mx80: mx80.o mplot.o plot.o palloc.o
754b842b 353+mx80: mx80.o mplot.o plot.o palloc.o
196b4671 354 $(CC) $(CFLAGS) mx80.o mplot.o plot.o $(common) \
355-palloc.o $(MLIB)
356- cp a.out $(INSTDIR)/mx80
754b842b 357+ palloc.o $(MLIB) -o mx80
196b4671 358
359-$(INSTDIR)/t4014: plotout.c ../lib/lib4014.a
754b842b 360+t4014: plotout.c ../lib/lib4014.a
196b4671 361 $(CC) -DFORTEK $(CFLAGS) plotout.c $(common) \
362-../lib/lib4014.a $(MLIB)
363- cp a.out $(INSTDIR)/t4014
754b842b 364+ ../lib/lib4014.a $(MLIB) -o t4014
196b4671 365 rm -f plotout.o
366
367-$(INSTDIR)/impress: impress.o implot.o imPfuncs.o plot.o
754b842b 368+impress: impress.o implot.o imPfuncs.o plot.o
196b4671 369 $(CC) $(CFLAGS) impress.o implot.o imPfuncs.o \
370-plot.o $(common) $(MLIB)
371- cp a.out $(INSTDIR)/impress
754b842b
JB		 372+ plot.o $(common) $(MLIB) -o impress
373+
374+aed5: aed5.o
375+ $(CC) $(CFLAGS) aed5.o $(common) $(MLIB) -o aed5
196b4671 376
377-$(INSTDIR)/aed5: aed5.o
378- $(CC) $(CFLAGS) aed5.o $(common) $(MLIB)
379- cp a.out $(INSTDIR)/aed5
380-
381-$(INSTDIR)/xmeta: xmeta.o xplot.o plot.o palloc.o
382- $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB)
383- cp a.out $(INSTDIR)/xmeta
384-
385-$(INSTDIR)/x11meta: xmeta.o x11plot.o plot.o palloc.o
386- $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB)
387- cp a.out $(INSTDIR)/x11meta
388-
389-$(INSTDIR)/psmeta: psmeta.o psplot.o
390- $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB)
391- cp a.out $(INSTDIR)/psmeta
392-
393-$(INSTDIR)/plotout: plotout.c
394- $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB)
395- cp a.out $(INSTDIR)/plotout
754b842b
JB		 396+xmeta: xmeta.o xplot.o plot.o palloc.o
397+ $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o xmeta
196b4671 398+
754b842b
JB		 399+x11meta: xmeta.o x11plot.o plot.o palloc.o
400+ $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o x11meta
196b4671 401+
754b842b
JB		 402+psmeta: psmeta.o psplot.o
403+ $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB) -o psmeta
196b4671 404+
754b842b
JB		 405+plotout: plotout.c
406+ $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB) -o plotout
196b4671 407 rm -f plotout.o
408
409-$(INSTDIR)/plotin: plotin.o primout.o
410- $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB)
411- cp a.out $(INSTDIR)/plotin
754b842b
JB		 412+plotin: plotin.o primout.o
413+ $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB) -o plotin
196b4671 414
415-$(INSTDIR)/pexpand: pexpand.o expand.o segment.o palloc.o
754b842b 416+pexpand: pexpand.o expand.o segment.o palloc.o
196b4671 417 $(CC) $(CFLAGS) pexpand.o expand.o segment.o \
418-$(common) palloc.o $(MLIB)
419- cp a.out $(INSTDIR)/pexpand
754b842b 420+ $(common) palloc.o $(MLIB) -o pexpand
196b4671 421
422-$(INSTDIR)/psort: psort.o sort.o palloc.o
423- $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB)
424- cp a.out $(INSTDIR)/psort
754b842b
JB		 425+psort: psort.o sort.o palloc.o
426+ $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB) -o psort
196b4671 427
428-$(INSTDIR)/cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
754b842b
JB		 429-wputs.o eputs.o quit.o $(COMPAT)
430+cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o wputs.o eputs.o quit.o $(COMPAT)
196b4671 431 $(CC) $(CFLAGS) cv.o mfio.o cvhfio.o syscalls.o misc.o \
432-savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB)
433- cp a.out $(INSTDIR)/cv
754b842b 434+ savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB) -o cv
196b4671 435
436-$(INSTDIR)/plot4: plot4.o primout.o
437- $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB)
438- cp a.out $(INSTDIR)/plot4
754b842b
JB		 439+plot4: plot4.o primout.o
440+ $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB) -o plot4
196b4671 441
442-$(INSTDIR)/tcurve: tcurve.o tgraph.o primout.o
754b842b 443+tcurve: tcurve.o tgraph.o primout.o
196b4671 444 $(CC) $(CFLAGS) tcurve.o tgraph.o primout.o \
445-$(common) $(MLIB)
446- cp a.out $(INSTDIR)/tcurve
754b842b 447+ $(common) $(MLIB) -o tcurve
196b4671 448
449-$(INSTDIR)/tscat: tscat.o tgraph.o primout.o
754b842b 450+tscat: tscat.o tgraph.o primout.o
196b4671 451 $(CC) $(CFLAGS) tscat.o tgraph.o primout.o \
452-$(common) $(MLIB)
453- cp a.out $(INSTDIR)/tscat
754b842b 454+ $(common) $(MLIB) -o tscat
196b4671 455+
754b842b
JB		 456+tbar: tbar.o tgraph.o primout.o
457+ $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB) -o tbar
196b4671 458
459-$(INSTDIR)/tbar: tbar.o tgraph.o primout.o
460- $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB)
461- cp a.out $(INSTDIR)/tbar
462-
463-$(EXEC2)/mtext: mtext.o primout.o
464- $(CC) $(CFLAGS) mtext.o primout.o $(common)
465- cp a.out $(EXEC2)/mtext
754b842b
JB		 466+mtext: mtext.o primout.o
467+ $(CC) $(CFLAGS) mtext.o primout.o $(common) -o mtext
196b4671 468
469 ../lib/libmeta.a: metacalls.o primout.o progname.o
754b842b
JB		 470- ar rc ../lib/libmeta.a metacalls.o primout.o \
471-$(common) progname.o
472+ ar rc ../lib/libmeta.a metacalls.o primout.o $(common) progname.o
473 -ranlib ../lib/libmeta.a
474
196b4671 475 ../lib/lib4014.a:
476 cd lib4014; make INSTDIR=../../lib install clean
477
478-$(INSTDIR)/bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
754b842b
JB		 479-calexpr.o caldefn.o calfunc.o ealloc.o
480+bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a calexpr.o caldefn.o calfunc.o ealloc.o
196b4671 481 $(CC) $(CFLAGS) bgraph.o mgvars.o mgraph.o \
482-calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB)
483- cp a.out $(INSTDIR)/bgraph
754b842b 484+ calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB) -o bgraph
196b4671 485
486-$(INSTDIR)/igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
754b842b
JB		 487-calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
488+igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
196b4671 489 $(CC) $(CFLAGS) igraph.o mgvars.o mgraph.o \
754b842b 490-calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
196b4671 491-../lib/libmeta.a $(MLIB)
492- cp a.out $(INSTDIR)/igraph
754b842b
JB		 493+ calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
494+ ../lib/libmeta.a $(MLIB) -o igraph
196b4671 495
496-$(INSTDIR)/dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
754b842b
JB		 497-calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
498+dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
196b4671 499 $(CC) $(CFLAGS) dgraph.o cgraph.o mgvars.o \
500-calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB)
501- cp a.out $(INSTDIR)/dgraph
754b842b 502+ calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB) -o dgraph
196b4671 503
504-$(INSTDIR)/gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
754b842b
JB		 505-calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
506+gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
196b4671 507 $(CC) $(CFLAGS) gcomp.o gcalc.o mgvars.o \
508-calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB)
509- cp a.out $(INSTDIR)/gcomp
754b842b 510+ calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB) -o gcomp
196b4671 511
512 calexpr.o: calexpr.c calcomp.h
513 $(CC) $(CFLAGS) -c -DVARIABLE -DFUNCTION -DRCONST calexpr.c
514diff -ur ray.orig/src/meta/igraph.c ray/src/meta/igraph.c
515--- ray.orig/src/meta/igraph.c Thu Aug 29 13:36:42 1991
516+++ ray/src/meta/igraph.c Sun Jun 17 17:30:58 2001
517@@ -14,6 +14,8 @@
518
519 #include "mgvars.h"
520
521+#include "meta.h"
522+
523 typedef struct {
524 char *descrip; /* description */
525 char *value; /* value */
526diff -ur ray.orig/src/meta/meta.h ray/src/meta/meta.h
527--- ray.orig/src/meta/meta.h Fri Dec 4 19:51:46 1992
528+++ ray/src/meta/meta.h Sun Jun 17 17:23:33 2001
529@@ -90,6 +90,7 @@
530 #define YMN 1 /* index in xy array for ymin */
531 #define XMX 2 /* index in xy array for xmax */
532 #define YMX 3 /* index in xy array for ymax */
533+#define pout stdout
534
535
536 /*
537diff -ur ray.orig/src/meta/meta2tga.c ray/src/meta/meta2tga.c
538--- ray.orig/src/meta/meta2tga.c Sat Oct 31 18:35:16 1992
539+++ ray/src/meta/meta2tga.c Sun Jun 17 17:21:55 2001
540@@ -38,7 +38,7 @@
541 static char outname[64];
542 static char *outtack = NULL;
543
544-static FILE *fout = stdout;
545+static FILE *fout;// = stdout;
546
547 static int lineno = 0;
548
549@@ -66,6 +66,8 @@
550 FILE *popen();
551 #endif
552 char comargs[200], command[300];
553+
554+ fout=stdout;
555
556 #ifdef CPM
557 fixargs("meta2tga", &argc, &argv);
558diff -ur ray.orig/src/meta/primout.c ray/src/meta/primout.c
559--- ray.orig/src/meta/primout.c Tue Feb 25 23:19:05 1986
560+++ ray/src/meta/primout.c Sun Jun 17 17:23:05 2001
561@@ -8,7 +8,7 @@
562 #include "meta.h"
563
564
565-FILE *pout = stdout; /* the primitive output stream */
566+// FILE *pout;// = stdout; /* the primitive output stream */
567
568
569 plseg(a0, xstart, ystart, xend, yend) /* plot line segment */
570diff -ur ray.orig/src/ot/Rmakefile ray/src/ot/Rmakefile
571--- ray.orig/src/ot/Rmakefile Tue Apr 4 01:46:49 1995
572+++ ray/src/ot/Rmakefile Sun Jun 17 17:16:16 2001
573@@ -24,14 +24,14 @@
574 o_cone.o o_instance.o bbox.o initotypes.o readfargs.o malloc.o
575 $(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
576 o_cone.o o_instance.o bbox.o readfargs.o \
577-initotypes.o malloc.o -lrt $(MLIB)
578+initotypes.o malloc.o -lrayt $(MLIB)
579
580 getbbox: getbbox.o readobj2.o bbox.o init2otypes.o
581 $(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
582-bbox.o init2otypes.o -lrt $(MLIB)
583+bbox.o init2otypes.o -lrayt $(MLIB)
584
585 install: oconv getbbox
586- cp oconv getbbox $(INSTDIR)
754b842b 587+ install oconv getbbox $(DESTDIR)$(INSTDIR)
196b4671 588
589 clean:
590 set nonomatch; rm -f oconv getbbox *.o core
591diff -ur ray.orig/src/px/Rmakefile ray/src/px/Rmakefile
592--- ray.orig/src/px/Rmakefile Wed Apr 16 01:56:32 1997
593+++ ray/src/px/Rmakefile Sun Jun 17 17:16:16 2001
594@@ -5,7 +5,7 @@
595 ARCH = sun
596 OPT = -O
597 MACH = -DBSD
598-SPECIAL = aed tiff
599+# SPECIAL = aed tiff
600 CFLAGS = $(OPT) $(MACH) -I../common -L../lib
601 CC = cc
602 MLIB = -lm
603@@ -40,145 +40,145 @@
604
605 install: $(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
606 pdfblur.csh pmblur.csh xyzimage.csh
607- cp $(PROGS) $(INSTDIR)
608- cp normpat.csh $(INSTDIR)/normpat
609- cp falsecolor.csh $(INSTDIR)/falsecolor
610- cp pdfblur.csh $(INSTDIR)/pdfblur
611- cp pmblur.csh $(INSTDIR)/pmblur
612- cp xyzimage.csh $(INSTDIR)/xyzimage
613- chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
614-$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage
754b842b
JB		 615+ install $(PROGS) $(DESTDIR)$(INSTDIR)
616+ install normpat.csh $(DESTDIR)$(INSTDIR)/normpat
617+ install falsecolor.csh $(DESTDIR)$(INSTDIR)/falsecolor
618+ install pdfblur.csh $(DESTDIR)$(INSTDIR)/pdfblur
619+ install pmblur.csh $(DESTDIR)$(INSTDIR)/pmblur
620+ install xyzimage.csh $(DESTDIR)$(INSTDIR)/xyzimage
196b4671 621+ chmod 755 $(DESTDIR)$(INSTDIR)/normpat $(DESTDIR)$(INSTDIR)/falsecolor \
622+$(DESTDIR)$(INSTDIR)/pdfblur $(DESTDIR)$(INSTDIR)/pmblur $(DESTDIR)$(INSTDIR)/xyzimage
623
624 clean:
625 set nonomatch; rm -f x10image aedimage glimage ra_tiff \
626 $(PROGS) *.o core
627
628 pfilt: pfilt.o pf2.o pf3.o
629- $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
630+ $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrayt $(MLIB)
631
632 pcond: pcond.o pcond2.o pcond3.o pcond4.o warp3d.o
633 $(CC) $(CFLAGS) -o pcond pcond.o pcond2.o pcond3.o pcond4.o warp3d.o \
634--lrt $(MLIB)
635+-lrayt $(MLIB)
636
637 pcwarp: pcwarp.o warp3d.o
638- $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrt $(MLIB)
639+ $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrayt $(MLIB)
640
641 ttyimage: ttyimage.o
642- $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrt $(MLIB)
643+ $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrayt $(MLIB)
644
645 t4027: t4027.o
646- $(CC) $(CFLAGS) -o t4027 t4027.o -lrt
647+ $(CC) $(CFLAGS) -o t4027 t4027.o -lrayt
648
649 glimage: glimage.o
650- $(CC) $(CFLAGS) -o glimage glimage.o -lrt -lgl_s $(MLIB)
651+ $(CC) $(CFLAGS) -o glimage glimage.o -lrayt -lgl_s $(MLIB)
652
653 aedimage: aedimage.o ciq.o cut.o closest.o biq.o
654 $(CC) $(CFLAGS) -o aedimage aedimage.o ciq.o cut.o closest.o \
655-biq.o -lrt $(MLIB)
656+biq.o -lrayt $(MLIB)
657
658 oki20c: oki20c.o
659- $(CC) $(CFLAGS) -o oki20c oki20c.o -lrt $(MLIB)
660+ $(CC) $(CFLAGS) -o oki20c oki20c.o -lrayt $(MLIB)
661
662 oki20: oki20.o
663- $(CC) $(CFLAGS) -o oki20 oki20.o -lrt $(MLIB)
664+ $(CC) $(CFLAGS) -o oki20 oki20.o -lrayt $(MLIB)
665
666 paintjet: paintjet.o
667- $(CC) $(CFLAGS) -o paintjet paintjet.o -lrt $(MLIB)
668+ $(CC) $(CFLAGS) -o paintjet paintjet.o -lrayt $(MLIB)
669
670 mt160r: mt160r.o
671- $(CC) $(CFLAGS) -o mt160r mt160r.o -lrt $(MLIB)
672+ $(CC) $(CFLAGS) -o mt160r mt160r.o -lrayt $(MLIB)
673
674 greyscale: greyscale.o
675- $(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
676+ $(CC) $(CFLAGS) -o greyscale greyscale.o -lrayt $(MLIB)
677
678 colorscale: colorscale.o
679- $(CC) $(CFLAGS) -o colorscale colorscale.o -lrt
680+ $(CC) $(CFLAGS) -o colorscale colorscale.o -lrayt
681
682 pvalue: pvalue.o
683- $(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
684+ $(CC) $(CFLAGS) -o pvalue pvalue.o -lrayt $(MLIB)
685
686 psum: psum.o
687- $(CC) $(CFLAGS) -o psum psum.o -lrt
688+ $(CC) $(CFLAGS) -o psum psum.o -lrayt
689
690 pcompos: pcompos.o
691- $(CC) $(CFLAGS) -o pcompos pcompos.o -lrt
692+ $(CC) $(CFLAGS) -o pcompos pcompos.o -lrayt
693
694 psign: psign.o
695- $(CC) $(CFLAGS) -o psign psign.o -lrt
696+ $(CC) $(CFLAGS) -o psign psign.o -lrayt
697
698 d48c: d48c.o
699- $(CC) $(CFLAGS) -o d48c d48c.o -lrt
700+ $(CC) $(CFLAGS) -o d48c d48c.o -lrayt
701
702 ra_gif: ra_gif.o clrtab.o neuclrtab.o
703- $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrt $(MLIB)
704+ $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrayt $(MLIB)
705
706 ra_pr: ra_pr.o ciq.o cut.o closest.o biq.o
707 $(CC) $(CFLAGS) -o ra_pr ra_pr.o ciq.o cut.o closest.o \
708-biq.o -lrt $(MLIB)
709+biq.o -lrayt $(MLIB)
710
711 ra_pr24: ra_pr24.o
712- $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrt $(MLIB)
713+ $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrayt $(MLIB)
714
715 ra_avs: ra_avs.o
716- $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrt $(MLIB)
717+ $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrayt $(MLIB)
718
719 ra_ps: ra_ps.o
720- $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrt $(MLIB)
721+ $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrayt $(MLIB)
722
723 ra_ppm: ra_ppm.o
724- $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrt $(MLIB)
725+ $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrayt $(MLIB)
726
727 ra_t8: ra_t8.o clrtab.o neuclrtab.o
728- $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrt $(MLIB)
729+ $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrayt $(MLIB)
730
731 ra_t16: ra_t16.o
732- $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrt $(MLIB)
733+ $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrayt $(MLIB)
734
735 ra_im: ra_im.o
736 $(CC) $(CFLAGS) -o ra_im ra_im.o
737
738 ra_bn: ra_bn.o
739- $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrt $(MLIB)
740+ $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrayt $(MLIB)
741
742 ra_rgbe: ra_rgbe.o
743- $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrt $(MLIB)
744+ $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrayt $(MLIB)
745
746 ra_pict: ra_pict.o
747- $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrt $(MLIB)
748+ $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrayt $(MLIB)
749
750
751 x10image: ximage.o ciq.o cut.o closest.o xraster.o biq.o
752 $(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
753-ciq.o cut.o closest.o biq.o -lX -lrt $(MLIB)
754+ciq.o cut.o closest.o biq.o -lX -lrayt $(MLIB)
755
756 ximage: x11image.o x11raster.o clrtab.o
757 $(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
758-clrtab.o -lX11 -lrt $(MLIB)
759+clrtab.o -lX11 -lrayt $(MLIB)
760
761 protate: protate.o
762- $(CC) $(CFLAGS) -o protate protate.o -lrt
763+ $(CC) $(CFLAGS) -o protate protate.o -lrayt
764
765 pextrem: pextrem.o
766- $(CC) $(CFLAGS) -o pextrem pextrem.o -lrt
767+ $(CC) $(CFLAGS) -o pextrem pextrem.o -lrayt
768
769 pflip: pflip.o
770- $(CC) $(CFLAGS) -o pflip pflip.o -lrt
771+ $(CC) $(CFLAGS) -o pflip pflip.o -lrayt
772
773 panim: panim.o client/libclient.a
774 $(CC) $(CFLAGS) -o panim panim.o \
775--lrt client/libclient.a -lrpcsvc $(MLIB)
776+-lrayt client/libclient.a -lrpcsvc $(MLIB)
777
778 pcomb: pcomb.o
779- $(CC) $(CFLAGS) -o pcomb pcomb.o -lrt $(MLIB)
780+ $(CC) $(CFLAGS) -o pcomb pcomb.o -lrayt $(MLIB)
781
782 pinterp: pinterp.o
783- $(CC) $(CFLAGS) -o pinterp pinterp.o -lrt $(MLIB)
784+ $(CC) $(CFLAGS) -o pinterp pinterp.o -lrayt $(MLIB)
785
786 ra_xyze: ra_xyze.o
787- $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrt $(MLIB)
788+ $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrayt $(MLIB)
789
790 ra_tiff: ra_tiff.o ../lib/libtiff.a
791- $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
792+ $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrayt -ltiff $(MLIB)
793
794 ra_tiff.o: ra_tiff.c
795 $(CC) $(CFLAGS) -Ilibtiff -c ra_tiff.c
796@@ -188,7 +188,7 @@
797 mv libtiff.a ../../lib ; make clean
798
799 ra_pixar: ra_pixar.o ra_pixar.c
800- $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
801+ $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrayt \
802 $(PIXAR_LIB)
803
804 ra_pixar.o: ra_pixar.c
805@@ -196,11 +196,11 @@
806
807 xshowtrace: xshowtrace.o x11findwind.o
808 $(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
809-x11findwind.o -lrt $(MLIB) -lX11
810+x11findwind.o -lrayt $(MLIB) -lX11
811
812 macbethcal: macbethcal.o pmapgen.o mx3.o warp3d.o
813 $(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
814--lrt $(MLIB)
815+-lrayt $(MLIB)
816
817
818 macbethcal.o: pmap.h ../common/color.h ../common/resolu.h
819diff -ur ray.orig/src/px/pcwarp.c ray/src/px/pcwarp.c
820--- ray.orig/src/px/pcwarp.c Thu Feb 6 02:29:26 1997
821+++ ray/src/px/pcwarp.c Sun Jun 17 17:25:54 2001
822@@ -14,7 +14,7 @@
823
824 char *progname; /* global argv[0] */
825
826-FILE *infp = stdin; /* input stream */
827+FILE *infp; // = stdin; /* input stream */
828 int xres, yres; /* input picture resolution */
829
830 WARP3D *cwarp; /* our warp map */
831@@ -30,6 +30,7 @@
832 int cwflags = 0;
833 int rval;
834 int i;
835+ infp=stdin;
836
837 progname = argv[0];
838 /* get options */
839diff -ur ray.orig/src/px/x11image.c ray/src/px/x11image.c
840--- ray.orig/src/px/x11image.c Wed Jan 28 01:59:42 1998
841+++ ray/src/px/x11image.c Sun Jun 17 17:25:18 2001
842@@ -94,7 +94,7 @@
843 int xmax, ymax; /* picture dimensions */
844 int width, height; /* window size */
845 char *fname = NULL; /* input file name */
846-FILE *fin = stdin; /* input file */
847+FILE *fin; // = stdin; /* input file */
848 long *scanpos = NULL; /* scan line positions in file */
849 int cury = 0; /* current scan location */
850
851@@ -144,6 +144,7 @@
852 int headline();
853 int i;
854 int pid;
855+ fin=stdin;
856
857 progname = argv[0];
858
859diff -ur ray.orig/src/rt/Rmakefile ray/src/rt/Rmakefile
860--- ray.orig/src/rt/Rmakefile Thu Jul 4 02:19:57 1996
861+++ ray/src/rt/Rmakefile Sun Jun 17 17:16:16 2001
862@@ -5,8 +5,8 @@
863
864 OPT = -O
865 MACH = -DBSD
866-CFLAGS = $(MACH) $(OPT) -I../common -L../lib
867-SPECIAL = aed
868+CFLAGS = $(MACH) $(OPT) -I../common -L../lib -I/usr/include/ncurses
869+# SPECIAL = aed
870 CC = cc
871 MLIB = -lm
872 LINT = lint
873@@ -29,7 +29,7 @@
874 #
875 # Library routines:
876 #
877-LIBS = -lrt $(MLIB)
878+LIBS = -lrayt $(MLIB)
879
880 #
881 # Device drivers for rview (see also devtable.c):
754b842b
JB		 882@@ -87,14 +87,14 @@
883 # What this makefile produces:
884 #
885
886-PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
887+PROGS = rtrace rpict rview lookamb
888
196b4671 889 all: $(PROGS) $(SPECIAL)
890
891 install: $(PROGS) $(SPECIAL) rayinit.cal
892- $(INSTALL) $(PROGS) $(INSTDIR)
893- rm -f $(LIBDIR)/rayinit.cal
894- cp rayinit.cal $(LIBDIR)
895+ $(INSTALL) $(PROGS) $(DESTDIR)$(INSTDIR)
896+ rm -f $(DESTDIR)$(LIBDIR)/rayinit.cal
754b842b 897+ install rayinit.cal $(DESTDIR)$(LIBDIR)
196b4671 898
899 sun: $(DEVDIR)/sun $(DEVDIR)/sun.com
900
754b842b
JB		 901@@ -116,19 +116,19 @@
902 # Links:
903 #
904
905-$(DESTDIR)/rtrace: $(RTOBJS)
906- $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
907+rtrace: $(RTOBJS)
908+ $(CC) $(CFLAGS) -o rtrace $(RTOBJS) $(LIBS)
196b4671 909
754b842b
JB		 910-$(DESTDIR)/rpict: $(RPOBJS)
911- $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
912+rpict: $(RPOBJS)
913+ $(CC) $(CFLAGS) -o rpict $(RPOBJS) $(LIBS)
914
915-$(DESTDIR)/rview: $(RVOBJS)
916- $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
917+rview: $(RVOBJS)
918+ $(CC) $(CFLAGS) -o rview $(RVOBJS) $(DLIBS) $(LIBS)
919
920-$(DESTDIR)/lookamb: lookamb.o ambio.o
196b4671 921- $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrt
754b842b
JB		 922+lookamb: lookamb.o ambio.o
923+ $(CC) $(CFLAGS) -o lookamb lookamb.o ambio.o -lrayt
196b4671 924
754b842b
JB		 925-$(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
926+(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
196b4671 927 $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
754b842b
JB		 928 editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
929
196b4671 930diff -ur ray.orig/src/util/Rmakefile ray/src/util/Rmakefile
931--- ray.orig/src/util/Rmakefile Wed Mar 19 00:59:42 1997
932+++ ray/src/util/Rmakefile Sun Jun 17 17:16:16 2001
933@@ -21,19 +21,19 @@
934
935 install: all objview.csh objpict.csh glare.csh dayfact.csh rlux.csh \
936 raddepend.csh trad.wsh objline.csh
937- cp $(PROGS) $(INSTDIR)
938- cp objview.csh $(INSTDIR)/objview
939- cp objline.csh $(INSTDIR)/objline
940- cp objpict.csh $(INSTDIR)/objpict
941- cp glare.csh $(INSTDIR)/glare
942- cp dayfact.csh $(INSTDIR)/dayfact
943- cp debugcal.csh $(INSTDIR)/debugcal
944- cp rlux.csh $(INSTDIR)/rlux
945- cp raddepend.csh $(INSTDIR)/raddepend
946- chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
947- $(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
948- $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline
949- csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
754b842b
JB		 950+ install $(PROGS) $(DESTDIR)$(INSTDIR)
951+ install objview.csh $(DESTDIR)$(INSTDIR)/objview
952+ install objline.csh $(DESTDIR)$(INSTDIR)/objline
953+ install objpict.csh $(DESTDIR)$(INSTDIR)/objpict
954+ install glare.csh $(DESTDIR)$(INSTDIR)/glare
955+ install dayfact.csh $(DESTDIR)$(INSTDIR)/dayfact
956+ install debugcal.csh $(DESTDIR)$(INSTDIR)/debugcal
957+ install rlux.csh $(DESTDIR)$(INSTDIR)/rlux
958+ install raddepend.csh $(DESTDIR)$(INSTDIR)/raddepend
196b4671 959+ chmod 755 $(DESTDIR)$(INSTDIR)/objview $(DESTDIR)$(INSTDIR)/objpict \
960+ $(DESTDIR)$(INSTDIR)/glare $(DESTDIR)$(INSTDIR)/dayfact $(DESTDIR)$(INSTDIR)/debugcal \
961+ $(DESTDIR)$(INSTDIR)/rlux $(DESTDIR)$(INSTDIR)/raddepend $(DESTDIR)$(INSTDIR)/objline
962+ csh -f tradinstall.csh $(DESTDIR)$(INSTDIR) $(DESTDIR)$(LIBDIR)/tcl
963
964 clean:
965 set nonomatch; rm -f *.o $(PROGS) core
966@@ -42,33 +42,33 @@
967 $(CC) $(CFLAGS) -o scanner scanner.o -lm
968
969 makedist: makedist.o setscan.o
970- $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
971+ $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrayt -lm
972
973 findglare: findglare.o glareval.o glaresrc.o setscan.o
974 $(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
975-setscan.o -lrt -lm
976+setscan.o -lrayt -lm
977
978 glarendx: glarendx.o
979- $(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
980+ $(CC) $(CFLAGS) -o glarendx glarendx.o -lrayt -lm
981
982 xglaresrc: xglaresrc.o x11findwind.o
983 $(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
984-x11findwind.o -lrt -lX11 -lm
985+x11findwind.o -lrayt -lX11 -lm
986
987 rad: rad.o
988- $(CC) $(CFLAGS) -o rad rad.o -lrt -lm
989+ $(CC) $(CFLAGS) -o rad rad.o -lrayt -lm
990
991 ranimate: ranimate.o netproc.o
992- $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
993+ $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrayt -lm
994
995 rpiece: rpiece.o Version.o
996- $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
997+ $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrayt -lm
998
999 vwright: vwright.o
1000- $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
1001+ $(CC) $(CFLAGS) -o vwright vwright.o -lrayt -lm
1002
1003 getinfo: getinfo.o
1004- $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
1005+ $(CC) $(CFLAGS) -o getinfo getinfo.o -lrayt
1006
1007 contour: contour.o
1008 $(CC) $(CFLAGS) -o contour contour.o -lm
Radiance 3D Photo-Realistic Renderer
This page took 0.198652 seconds and 4 git commands to generate.