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.7 by schorsch, Thu Oct 21 15:47:12 2004 UTC vs.
Revision 1.18 by schorsch, Sun Apr 27 17:22:49 2008 UTC

# Line 13 | Line 13 | def radlib(name): return os.path.join('$RAD_BUILDLIB',
13   warp3d = env.Object(source="warp3d.c")
14   clrtab = env.Object(source="clrtab.c")
15   neuclrtab = env.Object(source="neuclrtab.c")
16 ciq = env.Object(source="ciq.c")
17 cut = env.Object(source="cut.c")
18 closest = env.Object(source="closest.c")
16  
17   # standard targets
18   PROGS = (
19 < # name          files            libs
19 > # name       files            libs
20   ('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d],
21 <        ['rtpic','rtproc','rtpath','rtio','rtargs','rtcont','rtmem','rterror']),
21 >        ['rtpic','rtproc','rtpath','rtargs','rtio','rtcont','rtmem','rterror']),
22   ('pcond',    Split('pcond.c pcond2.c pcond3.c pcond4.c')+[warp3d],
23 <        ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtcont','rtmem','rterror']),
23 >        ['rtpic','rtproc','rtpath','rtargs','rtio','rtmath','rtcont','rtmem','rterror']),
24   ('pfilt',    Split('pfilt.c pf2.c pf3.c'),
25 <        ['rtlamps','rtpic','rtio','rtpath','rtargs','rtmath']),
26 < ('pcwarp',   ['pcwarp.c', warp3d],
25 >        ['rtlamps','rtpic','rtpath','rtargs','rtio','rtmath']),
26 > ('pcwarp',   ['pcwarp.c', warp3d],      
27          ['rtpic','rtio','rtcont','rtmem','rterror']),
28 < ('pvalue',   ['pvalue.c'],    ['rtpic','rtio','rtargs','rtmath']),
28 > ('pvalue',   ['pvalue.c'],    ['rtpic','rtargs','rtio','rtmath']),
29   ('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
30   ('psign',    ['psign.c'],
31 <        ['rtpic','rtscene','rtio','rtpath','rtargs','rtcont','rtmem','rterror']),
31 >        ['rtpic','rtscene','rtpath','rtargs','rtio','rtcont','rtmem','rterror']),
32   ('protate',  ['protate.c'],   ['rtpic','rtio']),
33   ('pextrem',  ['pextrem.c'],   ['rtpic','rtio']),
34   ('pflip',    ['pflip.c'],     ['rtpic','rtio']),
35   ('pcomb',    ['pcomb.c'],
36 <        ['rtpic','rtproc','rtpath','rtio','rtfunc','rtargs','rtmath','rtcont','rtmem']),
36 >        ['rtpic','rtproc','rtpath','rtfunc','rtargs','rtio','rtmath','rtcont','rtmem']),
37   ('pinterp',  ['pinterp.c'],
38 <        ['rtproc','rtpic','rtio','rtpath','rtargs','rtmath','rtmem','rterror']),
38 >        ['rtproc','rtpic','rtpath','rtargs','rtio','rtmath','rtmem','rterror']),
39  
43 ('oki20c',   ['oki20c.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
44 ('oki20',    ['oki20.c'], ['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
45
40   ('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
41 < ('ra_pr',    Split('ra_pr.c biq.c')+ [ciq, cut, closest],
48 <        ['rtpic','rtio','rtmem']),
49 < ('ra_pr24',  ['ra_pr24.c'],   ['rtpic','rtio','rtmem']),
50 < ('ra_avs',   ['ra_avs.c'],    ['rtpic','rtio','rtmem']),
51 < ('ra_ps',    ['ra_ps.c'],     ['rtpic','rtio','rtargs','rtmem']),
41 > ('ra_ps',    ['ra_ps.c'],     ['rtpic','rtargs','rtio','rtmem']),
42   ('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
43 < ('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtio','rtmem']),
43 > ('ra_bmp',   ['ra_bmp.c'],
44 >        ['rtpic','rtproc','rterror','rtpath','rtio','rtmem']),
45   ('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
46   ('ra_t16',   ['ra_t16.c'],    ['rtpic','rtio','rtmem']),
56 ('ra_bn',    ['ra_bn.c'],     ['rtpic','rtio','rtmem']),
47   ('ra_rgbe', ['ra_rgbe.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
48   ('ra_pict',  ['ra_pict.c'],   ['rtpic','rtio','rtmem']),
49   ('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']),
# Line 67 | Line 57 | for p in PROGS:
57      progs.append(prog)
58  
59  
70 # special targets not normally built
71 SPECIAL = (
72 # name          files             libs
73 ('psum',       ['psum.c'],       ['rtpic','rtio']),
74 #('panim',      ['panim.c'],      ['client','rpcsvc']),# missing externals
75
76 ('ra_im',      ['ra_im.c'],      ['rtproc','rtpath','rtio','rterror']),
77
78 #('aedimage',   Split('aedimage.c')+[ciq, cut, closest],[]),# missing externals
79 ('t4027',      ['t4027.c'],      ['rtpic']),
80 ('paintjet',   ['paintjet.c'],   ['rtpic','rtio','rtmem']),
81 ('mt160r',     ['mt160r.c'],     ['rtpic','rtio','rtmem']),
82 ('greyscale',  ['greyscale.c'],  ['rtpic']),
83 ('colorscale', ['colorscale.c'], ['rtpic']),
84 ('d48c',       ['d48c.c'],       ['rtpic']),
85 )
86 specprogs = []
87 specinst = []
88 for p in SPECIAL:
89        prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
90        specprogs.append(prog)
91        specinst.append(env.Install('$RAD_BINDIR', prog))
92 env.Alias('px_special', specprogs)
93 env.Alias('px_special_install', specinst)
94
95
60   # tiff library (unix-specific for the moment)
61   if os.name == 'posix':
62          cwd = os.getcwd()
63 +        upperdir = os.path.split(cwd)[0]
64 +
65          libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']),
66 <                'tiff/config.local',
67 <        [('cd "%s"; '
68 <        'sh ./configure -quiet -noninteractive '
69 <                '-with-CC="$CC" -with-ENVOPTS="$CCFLAGS"; '
70 <        'cd libtiff; '
71 <        'make install;') % os.path.join(cwd, 'tiff')])
66 >                None,
67 >        [('cd "%(tiffdir)s"; '
68 >                'env CC="$CC" '
69 >                './configure -C '
70 >                '"libdir=%(upperdir)s/lib" '
71 >                '--enable-static --disable-shared --disable-cxx '
72 >                '--enable-logluv --disable-jpeg --disable-zlib --disable-pixarlog; '
73 >                'cd %(portdir)s; make all;'
74 >                'cd %(libtiffdir)s; make install-exec;' # don't install headers
75 >         ) % {
76 >        'upperdir':upperdir,
77 >        'tiffdir':os.path.join(cwd, 'tiff'),
78 >        'portdir':os.path.join(cwd, 'tiff', 'port'),
79 >        'libtiffdir':os.path.join(cwd, 'tiff', 'libtiff')
80 >        }
81 >        ])
82  
83          # tiff programs
84 <        ra_tiff = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
84 >        ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'],
85                  LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
86          progs.append(ra_tiff)
87  
88 <        normtiff = env.Program(target=radbin('normtiff'), source=Split('normtiff.c'),
88 >        normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'],
89                  LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
90          progs.append(normtiff)
91  
92  
117 # pixar format requires extra lib
118 if env.has_key('PIXAR_LIB'):
119    ra_pixar = env.Program(radbin('ra_pixar'), source='ra_pixar.c',
120        LIBS=['rtpic', '$PIXAR_LIB'])
121    progs.append(ra_pixar)
122
123
93   # X11 targets
94   if env.has_key('X11LIB'):
95      xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
96      xlibp = env.get('LIBPATH', []) + ['$X11LIB']
97 <    xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem']
97 >    xlibs = ['X11','rtpic','rtargs','rtio','rtmath','rtmem']
98      x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
99          CPPPATH=xincl)
100  
# Line 139 | Line 108 | if env.has_key('X11LIB'):
108          CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
109      progs.append(xshowtrace)
110  
142 # NeWS ?!?
143 #    if env.has_key('OGL'):
144 #        glimage = env.Program(target=radbin('glimage'),
145 #            CPPFLAGS=env.get('CPPFLAGS', []) + [env['RAD_STEREO']],
146 #            source=Split('glimage.c'),
147 #            LIBS=['gl_s']+env['LIBS'],)
148 #        progs.append(glimage)
149
150
111   if os.name == 'posix': # XXX ignoring trad.wsh
112 <        for s in Split('''normpat falsecolor pdfblur
113 <                        pmblur xyzimage phisto pdelta pgblur'''):
112 >        for s in Split('''normpat falsecolor pdfblur pmblur pmdblur pbilat
113 >                        xyzimage phisto pdelta pgblur ra_pfm ran2tiff'''):
114                  Default(env.InstallCsh(radbin(s), s + '.csh'))
115 + # XXX probably needs fixing
116 + #else:
117 + #       for s in Split('''falsecolor'''):
118 + #               Default(env.InstallCsh(radbin(s), s + '.csh'))
119 + # ignored by Rmakefile: pacuity phisteq psquish pveil vlpic
120  
121   Default('#src/px')
122   env.Install('$RAD_BINDIR', progs)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines