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.1 by schorsch, Tue Oct 21 19:27:29 2003 UTC vs.
Revision 1.6 by schorsch, Tue Jul 6 11:49:09 2004 UTC

# Line 2 | Line 2 | import os
2  
3   Import('env') # inherit from parent
4  
5 < # make a modified local copy
6 < px = env.Copy(LIBS=['rt'] + env['RAD_MLIB'])
5 > mlib = env['RAD_MLIB']
6  
7   # compose paths
8 < def radbin(name): return os.path.join(px['RAD_BUILDBIN'], name)
9 < def radlib(name): return os.path.join(px['RAD_BUILDLIB'], name)
8 > def radbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
9 > def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
10  
11 + warp3d = env.Object(source="warp3d.c")
12 + clrtab = env.Object(source="clrtab.c")
13 + neuclrtab = env.Object(source="neuclrtab.c")
14 + ciq = env.Object(source="ciq.c")
15 + cut = env.Object(source="cut.c")
16 + closest = env.Object(source="closest.c")
17 +
18   # standard targets
19   PROGS = (
20 < ('macbethcal', Split('macbethcal.c pmapgen.c mx3.c warp3d.c')),
21 < ('pcond',      Split('pcond.c pcond2.c pcond3.c pcond4.c warp3d.c')),
22 < ('pfilt',      Split('pfilt.c pf2.c pf3.c')),
23 < ('pcwarp',     Split('pcwarp.c warp3d.c')),
24 < ('pvalue',     Split('pvalue.c')),
25 < ('pcompos',    Split('pcompos.c')),
26 < ('psign',      Split('psign.c')),
27 < ('protate',    Split('protate.c')),
28 < ('pextrem',    Split('pextrem.c')),
29 < ('pflip',      Split('pflip.c')),
30 < ('pcomb',      Split('pcomb.c')),
31 < ('pinterp',    Split('pinterp.c')),
20 > # name          files            libs
21 > ('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d],
22 >        ['rtpic','rtproc','rtpath','rtio','rtargs','rtcont','rtmem','rterror']),
23 > ('pcond',    Split('pcond.c pcond2.c pcond3.c pcond4.c')+[warp3d],
24 >        ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtcont','rtmem','rterror']),
25 > ('pfilt',    Split('pfilt.c pf2.c pf3.c'),
26 >        ['rtlamps','rtpic','rtio','rtpath','rtargs','rtmath']),
27 > ('pcwarp',   ['pcwarp.c', warp3d],
28 >        ['rtpic','rtio','rtcont','rtmem','rterror']),
29 > ('pvalue',   ['pvalue.c'],    ['rtpic','rtio','rtargs','rtmath']),
30 > ('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
31 > ('psign',    ['psign.c'],
32 >        ['rtpic','rtscene','rtio','rtpath','rtargs','rtcont','rtmem','rterror']),
33 > ('protate',  ['protate.c'],   ['rtpic','rtio']),
34 > ('pextrem',  ['pextrem.c'],   ['rtpic','rtio']),
35 > ('pflip',    ['pflip.c'],     ['rtpic','rtio']),
36 > ('pcomb',    ['pcomb.c'],
37 >        ['rtpic','rtproc','rtpath','rtio','rtfunc','rtargs','rtmath','rtcont','rtmem']),
38 > ('pinterp',  ['pinterp.c'],
39 >        ['rtproc','rtpic','rtio','rtpath','rtargs','rtmath','rtmem','rterror']),
40  
41 < ('oki20c',     Split('oki20c.c')),
42 < ('oki20',      Split('oki20.c')),
41 > ('oki20c',   ['oki20c.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
42 > ('oki20',    ['oki20.c'], ['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
43  
44 < ('ra_gif',     Split('ra_gif.c clrtab.c neuclrtab.c')),
45 < ('ra_pr',      Split('ra_pr.c ciq.c cut.c closest.c biq.c')),
46 < ('ra_pr24',    Split('ra_pr24.c')),
47 < ('ra_avs',     Split('ra_avs.c')),
48 < ('ra_ps',      Split('ra_ps.c')),
49 < ('ra_ppm',     Split('ra_ppm.c')),
50 < ('ra_t8',      Split('ra_t8.c clrtab.c neuclrtab.c')),
51 < ('ra_t16',     Split('ra_t16.c')),
52 < ('ra_bn',      Split('ra_bn.c')),
53 < ('ra_rgbe',    Split('ra_rgbe.c')),
54 < ('ra_pict',    Split('ra_pict.c')),
55 < ('ra_hexbit',  Split('ra_hexbit.c')),
56 < ('ra_xyze',    Split('ra_xyze.c')),
44 > ('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
45 > ('ra_pr',    Split('ra_pr.c biq.c')+ [ciq, cut, closest],
46 >        ['rtpic','rtio','rtmem']),
47 > ('ra_pr24',  ['ra_pr24.c'],   ['rtpic','rtio','rtmem']),
48 > ('ra_avs',   ['ra_avs.c'],    ['rtpic','rtio','rtmem']),
49 > ('ra_ps',    ['ra_ps.c'],     ['rtpic','rtio','rtargs','rtmem']),
50 > ('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
51 > ('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtio','rtmem']),
52 > ('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
53 > ('ra_t16',   ['ra_t16.c'],    ['rtpic','rtio','rtmem']),
54 > ('ra_bn',    ['ra_bn.c'],     ['rtpic','rtio','rtmem']),
55 > ('ra_rgbe', ['ra_rgbe.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
56 > ('ra_pict',  ['ra_pict.c'],   ['rtpic','rtio','rtmem']),
57 > ('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']),
58 > ('ra_xyze',  ['ra_xyze.c'],   ['rtpic','rtio','rtmem']),
59  
60 < ('ttyimage',   Split('ttyimage.c')),
60 > ('ttyimage', ['ttyimage.c'],  ['rtpic','rtio','rtmem']),
61   )
62   for p in PROGS:
63 <    prog = px.Program(target=radbin(p[0]), source=p[1])
63 >    prog = env.Program(target=radbin(p[0]), source=p[1],
64 >                LIBS=p[2]+mlib)
65      Default(prog)
66 <    env.Append(RAD_BININSTALL=[px.Install(px['RAD_BINDIR'], prog)])
66 >    env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
67  
68  
69   # special targets not normally built
70   SPECIAL = (
71 < #('psum',       Split('psum.c'), ['rt']),  # (errors)
72 < #('panim',      Split('panim.c'), px['LIBS]+['client','rpcsvc']),
71 > # name          files             libs
72 > ('psum',       ['psum.c'],       ['rtpic','rtio']),
73 > #('panim',      ['panim.c'],      ['client','rpcsvc']),# missing externals
74  
75 < ('ra_im',     Split('ra_im.c')),
75 > ('ra_im',      ['ra_im.c'],      ['rtproc','rtpath','rtio','rterror']),
76  
77 < #('aedimage',   Split('aedimage.c ciq.c cut.c closest.c'), []), # (errors)
78 < ('t4027',      Split('t4027.c'), ['rt']),
79 < ('paintjet',   Split('paintjet.c')),
80 < ('mt160r',     Split('mt160r.c')),
81 < ('greyscale',  Split('greyscale.c')),
82 < ('colorscale', Split('colorscale.c')),
83 < ('d48c',       Split('d48c.c'), ['rt']),   # (warnings)
77 > #('aedimage',   Split('aedimage.c')+[ciq, cut, closest],[]),# missing externals
78 > ('t4027',      ['t4027.c'],      ['rtpic']),
79 > ('paintjet',   ['paintjet.c'],   ['rtpic','rtio','rtmem']),
80 > ('mt160r',     ['mt160r.c'],     ['rtpic','rtio','rtmem']),
81 > ('greyscale',  ['greyscale.c'],  ['rtpic']),
82 > ('colorscale', ['colorscale.c'], ['rtpic']),
83 > ('d48c',       ['d48c.c'],       ['rtpic']),
84   )
85   specprogs = []
86   specinst = []
87   for p in SPECIAL:
88 <        if len(p) > 2:
71 <                prog = px.Program(target=radbin(p[0]), source=p[1],
72 <                        LIBS=p[2])
73 <        else:
74 <                prog = px.Program(target=radbin(p[0]), source=p[1])
88 >        prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
89          specprogs.append(prog)
90 <        specinst.append(px.Install(px['RAD_BINDIR'], prog))
91 < px.Alias('px_special', specprogs)
92 < px.Alias('px_special_install', specinst)
90 >        specinst.append(env.Install(env['RAD_BINDIR'], prog))
91 > env.Alias('px_special', specprogs)
92 > env.Alias('px_special_install', specinst)
93  
94  
95   # tiff library (unix-specific for the moment)
96   if os.name == 'posix':
97          cwd = os.getcwd()
98 <        libtiff = px.Command(radlib(px['LIBPREFIX'] + 'tiff' + px['LIBSUFFIX']),
98 >        libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']),
99                  'tiff/config.local',
100 <        ['cd "%s";'
101 <        'sh ./configure -quiet -noninteractive -with-CC=$CC -with-ENVOPTS=$CCFLAGS;'
102 <        'cd libtiff;'
103 <        'make install;' % os.path.join(cwd, 'tiff')])
100 >        [('cd "%s"; '
101 >        'sh ./configure -quiet -noninteractive '
102 >                '-with-CC="$CC" -with-ENVOPTS="$CCFLAGS"; '
103 >        'cd libtiff; '
104 >        'make install;') % os.path.join(cwd, 'tiff')])
105  
106          # tiff programs
107 <        ra_tiff = px.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
108 <                LIBS=['tiff'] + px['LIBS'])
107 >        ra_tiff = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
108 >                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
109          Default(ra_tiff)
110 <        env.Append(RAD_BININSTALL=[px.Install(px['RAD_BINDIR'], ra_tiff)])
110 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ra_tiff)])
111  
112 <        normtiff = px.Program(target=radbin('normtiff'), source=Split('normtiff.c'),
113 <                LIBS=['tiff'] + px['LIBS'])
112 >        normtiff = env.Program(target=radbin('normtiff'), source=Split('normtiff.c'),
113 >                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
114          Default(normtiff)
115 <        env.Append(RAD_BININSTALL=[px.Install(px['RAD_BINDIR'], normtiff)])
115 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], normtiff)])
116  
117  
118   # pixar format requires extra lib
119 < if px.has_key('PIXAR_LIB'):
120 <    ra_pixar = px.Program(radbin('ra_pixar'), source=['ra_pixar.c'],
121 <                LIBS=['rt', px['PIXAR_LIB']])
119 > if env.has_key('PIXAR_LIB'):
120 >    ra_pixar = env.Program(radbin('ra_pixar'), source=['ra_pixar.c'],
121 >        LIBS=['rtpic', env['PIXAR_LIB']])
122      Default(ra_pixar)
123 <    env.Append(RAD_BININSTALL=[px.Install(px['RAD_BINDIR'], ra_pixar)])
123 >    env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ra_pixar)])
124  
125  
126   # X11 targets
127 < if px.has_key('X11LIB'):
128 <    px.Append(CPPPATH=px['X11INCLUDE'])
129 <    px.Append(LIBS=['X11'])
130 <    px.Append(LIBPATH=px['X11LIB'])
127 > if env.has_key('X11LIB'):
128 >    xincl = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
129 >    xlibp = env.get('LIBPATH',[]) + [env['X11LIB']]
130 >    xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem']
131 >    x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
132 >                CPPPATH=xincl)
133  
134 <    ximage = px.Program(target=radbin('ximage'),
135 <        source=Split('x11image.c x11raster.c clrtab.c'),)
134 >    ximage = env.Program(target=radbin('ximage'),
135 >        source=Split('x11image.c x11raster.c')+[clrtab],
136 >        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
137      Default(ximage)
138 <    env.Append(RAD_BININSTALL=[px.Install(px['RAD_BINDIR'], ximage)])
138 >    env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ximage)])
139  
140 <    xshowtrace = px.Program(target=radbin('xshowtrace'),
141 <        source=Split('xshowtrace.c x11findwind.c'),)
140 >    xshowtrace = env.Program(target=radbin('xshowtrace'),
141 >        source=Split('xshowtrace.c') + [x11findwind],
142 >        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
143      Default(xshowtrace)
144 <    env.Append(RAD_BININSTALL=[px.Install(px['RAD_BINDIR'], xshowtrace)])
144 >    env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xshowtrace)])
145  
146   # NeWS ?!?
147 < #    if px.has_key('OGL'):
148 < #        glimage = px.Program(target=radbin('glimage'),
149 < #            CPPFLAGS=px.get('CPPFLAGS', []) + [px['RAD_STEREO']],
147 > #    if env.has_key('OGL'):
148 > #        glimage = env.Program(target=radbin('glimage'),
149 > #            CPPFLAGS=env.get('CPPFLAGS', []) + [env['RAD_STEREO']],
150   #            source=Split('glimage.c'),
151 < #            LIBS=['gl_s']+px['LIBS'],)
151 > #            LIBS=['gl_s']+env['LIBS'],)
152   #        Default(glimage)
153 < #        env.Append(RAD_BININSTALL=[px.Install(px['RAD_BINDIR'], glimage)])
153 > #        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], glimage)])
154  
155  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines