ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/px/SConscript

Comparing ray/src/px/SConscript (file contents):
Revision 1.22 by schorsch, Thu Mar 10 17:36:18 2016 UTC vs.
Revision 1.23 by schorsch, Thu Mar 10 21:43:23 2016 UTC

#	Line 16 | Line 16 | neuclrtab = env.Object(source="neuclrtab.c")
16		# standard targets
17		PROGS = (
18		# name       files            libs
19	<	('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d],
20	<	['rtpic','rtproc','rtpath','rtargs','rtio','rtcont','rtmem','rterror']),
21	<	('pcond',    Split('pcond.c pcond2.c pcond3.c pcond4.c')+[warp3d],
22	<	['rtpic','rtproc','rtpath','rtargs','rtio','rtmath','rtcont','rtmem','rterror']),
23	<	('pfilt',    Split('pfilt.c pf2.c pf3.c'),
24	<	['rtlamps','rtpic','rtpath','rtargs','rtio','rtmath']),
25	<	('pcwarp',   ['pcwarp.c', warp3d],
26	<	['rtpic','rtio','rtcont','rtmem','rterror']),
27	<	('pvalue',   ['pvalue.c'],    ['rtpic','rtargs','rtio','rtmath']),
28	<	('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
29	<	('psign',    ['psign.c'],
30	<	['rtpic','rtscene','rtpath','rtargs','rtio','rtcont','rtmem','rterror']),
31	<	('protate',  ['protate.c'],   ['rtpic','rtio']),
32	<	('pextrem',  ['pextrem.c'],   ['rtpic','rtio']),
33	<	('pflip',    ['pflip.c'],     ['rtpic','rtio']),
34	<	('pcomb',    ['pcomb.c'],
35	<	['rtpic','rtproc','rtpath','rtfunc','rtargs','rtio','rtmath','rtcont','rtmem']),
36	<	('pinterp',  ['pinterp.c'],
37	<	['rtproc','rtpic','rtpath','rtargs','rtio','rtmath','rtmem','rterror']),
19	>	('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d], ['rtrad']),
20	>	('pcond',    Split('pcond.c pcond2.c pcond3.c pcond4.c')+[warp3d], ['rtrad']),
21	>	('pfilt',    Split('pfilt.c pf2.c pf3.c'), ['rtrad']),
22	>	('pcwarp',   ['pcwarp.c', warp3d],       ['rtrad']),
23	>	('pvalue',   ['pvalue.c'],    ['rtrad']),
24	>	('pcompos',  ['pcompos.c'],   ['rtrad']),
25	>	('psign',    ['psign.c'],     ['rtrad']),
26	>	('protate',  ['protate.c'],   ['rtrad']),
27	>	('pextrem',  ['pextrem.c'],   ['rtrad']),
28	>	('pflip',    ['pflip.c'],     ['rtrad']),
29	>	('pcomb',    ['pcomb.c'],     ['rtrad']),
30	>	('pinterp',  ['pinterp.c'],   ['rtrad']),
31
32	<	('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
33	<	('ra_ps',    ['ra_ps.c'],     ['rtpic','rtargs','rtio','rtmem']),
34	<	('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
35	<	('ra_bmp',   ['ra_bmp.c'],
36	<	['rtpic','rtproc','rterror','rtpath','rtio','rtmem']),
37	<	('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
38	<	('ra_t16',   ['ra_t16.c'],    ['rtpic','rtio','rtmem']),
39	<	('ra_rgbe', ['ra_rgbe.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
40	<	('ra_pict',  ['ra_pict.c'],   ['rtpic','rtio','rtmem']),
41	<	('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']),
42	<	('ra_xyze',  ['ra_xyze.c'],   ['rtpic','rtio','rtmem']),
50	<	('pmblur2',  ['pmblur2.c'],   ['rtpic','rtargs','rtio','rtargs','rtmath','rtmem','rtcont','rterror',mlib]),
32	>	('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtrad']),
33	>	('ra_ps',    ['ra_ps.c'],     ['rtrad']),
34	>	('ra_ppm',   ['ra_ppm.c'],    ['rtrad']),
35	>	('ra_bmp',   ['ra_bmp.c'],    ['rtrad']),
36	>	('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtrad']),
37	>	('ra_t16',   ['ra_t16.c'],    ['rtrad']),
38	>	('ra_rgbe',  ['ra_rgbe.c'],   ['rtrad']),
39	>	('ra_pict',  ['ra_pict.c'],   ['rtrad']),
40	>	('ra_hexbit',['ra_hexbit.c'], ['rtrad']),
41	>	('ra_xyze',  ['ra_xyze.c'],   ['rtrad']),
42	>	('pmblur2',  ['pmblur2.c'],   ['rtrad']),
43
44	<	('ttyimage', ['ttyimage.c'],  ['rtpic','rtio','rtmem']),
44	>	('ttyimage', ['ttyimage.c'],  ['rtrad']),
45		)
46		for p in PROGS:
47		prog = env.Program(target=radbin(p[0]), source=p[1],
#	Line 97 | Line 89 | if env.get('TIFFLIB_INSTALLED'):
89
90		ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'],
91		CPPPATH = tiffincl, LIBPATH=tifflib,
92	<	LIBS=[libtiff,'rtpic','rtio','rtmem'] + mlib)
92	>	LIBS=[libtiff,'rtrad'] + mlib)
93		progs.append(ra_tiff)
94
95		normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'],
96		CPPPATH = tiffincl, LIBPATH=tifflib,
97	<	LIBS=[libtiff,'rtpic','rtio','rtmem', 'rtproc', 'rtpath', 'rterror'] + mlib)
97	>	LIBS=[libtiff,'rtrad'] + mlib)
98		progs.append(normtiff)
99
100
#	Line 110 | Line 102 | if env.get('TIFFLIB_INSTALLED'):
102		if env.has_key('X11LIB'):
103		xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
104		xlibp = env.get('LIBPATH', []) + ['$X11LIB']
105	<	xlibs = ['X11','rtpic','rtargs','rtio','rtmath','rtmem']
105	>	xlibs = ['X11','rtrad']
106		env.x11findwind = env.Object(source='../common/x11findwind.c', # XXX remote magic
107		CPPPATH=xincl)
108

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)