ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/px/SConscript
(Generate patch)

Comparing ray/src/px/SConscript (file contents):
Revision 1.21 by schorsch, Sat Mar 5 13:24:58 2016 UTC vs.
Revision 1.24 by schorsch, Mon Jan 8 13:38:37 2018 UTC

# Line 1 | Line 1
1 + from __future__ import division, print_function, unicode_literals
2 +
3   import os
4  
5   Import('env') # inherit from parent
# Line 16 | Line 18 | neuclrtab = env.Object(source="neuclrtab.c")
18   # standard targets
19   PROGS = (
20   # name       files            libs
21 < ('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d],
22 <        ['rtpic','rtproc','rtpath','rtargs','rtio','rtcont','rtmem','rterror']),
23 < ('pcond',    Split('pcond.c pcond2.c pcond3.c pcond4.c')+[warp3d],
24 <        ['rtpic','rtproc','rtpath','rtargs','rtio','rtmath','rtcont','rtmem','rterror']),
25 < ('pfilt',    Split('pfilt.c pf2.c pf3.c'),
26 <        ['rtlamps','rtpic','rtpath','rtargs','rtio','rtmath']),
27 < ('pcwarp',   ['pcwarp.c', warp3d],      
28 <        ['rtpic','rtio','rtcont','rtmem','rterror']),
29 < ('pvalue',   ['pvalue.c'],    ['rtpic','rtargs','rtio','rtmath']),
30 < ('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
31 < ('psign',    ['psign.c'],
32 <        ['rtpic','rtscene','rtpath','rtargs','rtio','rtcont','rtmem','rterror']),
33 < ('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']),
21 > ('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d], ['rtrad']),
22 > ('pcond',    Split('pcond.c pcond2.c pcond3.c pcond4.c')+[warp3d], ['rtrad']),
23 > ('pfilt',    Split('pfilt.c pf2.c pf3.c'), ['rtrad']),
24 > ('pcwarp',   ['pcwarp.c', warp3d],       ['rtrad']),
25 > ('pvalue',   ['pvalue.c'],    ['rtrad']),
26 > ('pcompos',  ['pcompos.c'],   ['rtrad']),
27 > ('psign',    ['psign.c'],     ['rtrad']),
28 > ('protate',  ['protate.c'],   ['rtrad']),
29 > ('pextrem',  ['pextrem.c'],   ['rtrad']),
30 > ('pflip',    ['pflip.c'],     ['rtrad']),
31 > ('pcomb',    ['pcomb.c'],     ['rtrad']),
32 > ('pinterp',  ['pinterp.c'],   ['rtrad']),
33 > ('psketch',  ['psketch.c'],   ['rtrad']),
34  
35 < ('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
36 < ('ra_ps',    ['ra_ps.c'],     ['rtpic','rtargs','rtio','rtmem']),
37 < ('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
38 < ('ra_bmp',   ['ra_bmp.c'],
39 <        ['rtpic','rtproc','rterror','rtpath','rtio','rtmem']),
40 < ('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
41 < ('ra_t16',   ['ra_t16.c'],    ['rtpic','rtio','rtmem']),
42 < ('ra_rgbe', ['ra_rgbe.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
43 < ('ra_pict',  ['ra_pict.c'],   ['rtpic','rtio','rtmem']),
44 < ('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']),
45 < ('ra_xyze',  ['ra_xyze.c'],   ['rtpic','rtio','rtmem']),
50 < ('pmblur2',  ['pmblur2.c'],   ['rtpic','rtargs','rtio','rtargs','rtmath','rtmem','rtcont','rterror',mlib]),
35 > ('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtrad']),
36 > ('ra_ps',    ['ra_ps.c'],     ['rtrad']),
37 > ('ra_ppm',   ['ra_ppm.c'],    ['rtrad']),
38 > ('ra_bmp',   ['ra_bmp.c'],    ['rtrad']),
39 > ('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtrad']),
40 > ('ra_t16',   ['ra_t16.c'],    ['rtrad']),
41 > ('ra_rgbe',  ['ra_rgbe.c'],   ['rtrad']),
42 > ('ra_pict',  ['ra_pict.c'],   ['rtrad']),
43 > ('ra_hexbit',['ra_hexbit.c'], ['rtrad']),
44 > ('ra_xyze',  ['ra_xyze.c'],   ['rtrad']),
45 > ('pmblur2',  ['pmblur2.c'],   ['rtrad']),
46  
47 < ('ttyimage', ['ttyimage.c'],  ['rtpic','rtio','rtmem']),
47 > ('ttyimage', ['ttyimage.c'],  ['rtrad']),
48   )
49   for p in PROGS:
50      prog = env.Program(target=radbin(p[0]), source=p[1],
# Line 86 | Line 81 | if os.name == 'posix': # cleanup action for a previous
81          Clean(libtiff_fn, [libtiff_fn, radlib(env['LIBPREFIX'] + 'tiff.la')])
82  
83   if env.get('TIFFLIB_INSTALLED'):
84 +        libtiff = env.get('RAD_LIBTIFF')
85          # tiff programs
86          tiffi = env.get('RAD_TIFFINCLUDE')
87          if tiffi: tiffincl = [tiffi] + env.get('CPPPATH', [])
# Line 96 | Line 92 | if env.get('TIFFLIB_INSTALLED'):
92  
93          ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'],
94                  CPPPATH = tiffincl, LIBPATH=tifflib,
95 <                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
95 >                LIBS=[libtiff,'rtrad'] + mlib)
96          progs.append(ra_tiff)
97  
98          normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'],
99                  CPPPATH = tiffincl, LIBPATH=tifflib,
100 <                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
100 >                LIBS=[libtiff,'rtrad'] + mlib)
101          progs.append(normtiff)
102  
103  
# Line 109 | Line 105 | if env.get('TIFFLIB_INSTALLED'):
105   if env.has_key('X11LIB'):
106          xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
107          xlibp = env.get('LIBPATH', []) + ['$X11LIB']
108 <        xlibs = ['X11','rtpic','rtargs','rtio','rtmath','rtmem']
109 <        env.x11findwind = env.Object(source='../common/x11findwind.c', # XXX remote magic
108 >        xlibs = ['X11','rtrad']
109 >        env.x11findwind = env.Object(source='../common/x11findwind.c',
110                  CPPPATH=xincl)
111  
112          ximage = env.Program(target=radbin('ximage'),
# Line 119 | Line 115 | if env.has_key('X11LIB'):
115          progs.append(ximage)
116  
117          xshowtrace = env.Program(target=radbin('xshowtrace'),
118 <                source=Split('xshowtrace.c') + [env.x11findwind], # XXX remote magic
118 >                source=Split('xshowtrace.c') + [env.x11findwind],
119                  CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
120          progs.append(xshowtrace)
121  
122 + pyscripts = Split('''falsecolor phisto''')
123   if os.name == 'posix': # XXX ignoring trad.wsh
124          for s in Split('''normpat pdfblur pmblur pmdblur
125 <                        xyzimage phisto pdelta pgblur ra_pfm ran2tiff pbilat'''):
125 >                        xyzimage pgblur ra_pfm ran2tiff pbilat'''):
126                  Default(env.InstallScript(radbin(s), s + '.csh'))
127 <        for s in Split('''falsecolor'''):
128 <                Default(env.InstallScript(radbin(s), s + '.pl'))
129 < # XXX probably needs fixing
130 < #else:
131 < #       for s in Split('''falsecolor'''):
132 < #               Default(env.InstallScript(radbin(s), s + '.pl'))
127 >        for s in pyscripts:
128 >                Default(env.InstallScript(radbin(s), s + '.py'))
129 > else:
130 >        for s in pyscripts:
131 >                Default(env.InstallScript(radbin(s + '.py'), s + '.py'))
132 >        
133 >
134   # ignored by Rmakefile: pacuity phisteq psquish pveil vlpic
135  
136   Default('#src/px')
137   env.Install('$RAD_BINDIR', progs)
138  
139   # vim: set syntax=python:
140 + # vi: set ts=4 sw=4 :

Diff Legend

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