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.22 by schorsch, Thu Mar 10 17:36:18 2016 UTC

# Line 7 | Line 7 | progs = []
7  
8   # compose paths
9   def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
10 #def radbin(name): return name
10   def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
11  
12   warp3d = env.Object(source="warp3d.c")
13   clrtab = env.Object(source="clrtab.c")
14   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")
15  
16   # standard targets
17   PROGS = (
18 < # name          files            libs
18 > # name       files            libs
19   ('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d],
20 <        ['rtpic','rtproc','rtpath','rtio','rtargs','rtcont','rtmem','rterror']),
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','rtio','rtargs','rtmath','rtcont','rtmem','rterror']),
22 >        ['rtpic','rtproc','rtpath','rtargs','rtio','rtmath','rtcont','rtmem','rterror']),
23   ('pfilt',    Split('pfilt.c pf2.c pf3.c'),
24 <        ['rtlamps','rtpic','rtio','rtpath','rtargs','rtmath']),
25 < ('pcwarp',   ['pcwarp.c', warp3d],
24 >        ['rtlamps','rtpic','rtpath','rtargs','rtio','rtmath']),
25 > ('pcwarp',   ['pcwarp.c', warp3d],      
26          ['rtpic','rtio','rtcont','rtmem','rterror']),
27 < ('pvalue',   ['pvalue.c'],    ['rtpic','rtio','rtargs','rtmath']),
27 > ('pvalue',   ['pvalue.c'],    ['rtpic','rtargs','rtio','rtmath']),
28   ('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
29   ('psign',    ['psign.c'],
30 <        ['rtpic','rtscene','rtio','rtpath','rtargs','rtcont','rtmem','rterror']),
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','rtio','rtfunc','rtargs','rtmath','rtcont','rtmem']),
35 >        ['rtpic','rtproc','rtpath','rtfunc','rtargs','rtio','rtmath','rtcont','rtmem']),
36   ('pinterp',  ['pinterp.c'],
37 <        ['rtproc','rtpic','rtio','rtpath','rtargs','rtmath','rtmem','rterror']),
37 >        ['rtproc','rtpic','rtpath','rtargs','rtio','rtmath','rtmem','rterror']),
38  
43 ('oki20c',   ['oki20c.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
44 ('oki20',    ['oki20.c'], ['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
45
39   ('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
40 < ('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']),
40 > ('ra_ps',    ['ra_ps.c'],     ['rtpic','rtargs','rtio','rtmem']),
41   ('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
42 < ('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtio','rtmem']),
42 > ('ra_bmp',   ['ra_bmp.c'],
43 >        ['rtpic','rtproc','rterror','rtpath','rtio','rtmem']),
44   ('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
45   ('ra_t16',   ['ra_t16.c'],    ['rtpic','rtio','rtmem']),
56 ('ra_bn',    ['ra_bn.c'],     ['rtpic','rtio','rtmem']),
46   ('ra_rgbe', ['ra_rgbe.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
47   ('ra_pict',  ['ra_pict.c'],   ['rtpic','rtio','rtmem']),
48   ('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']),
49   ('ra_xyze',  ['ra_xyze.c'],   ['rtpic','rtio','rtmem']),
50 + ('pmblur2',  ['pmblur2.c'],   ['rtpic','rtargs','rtio','rtargs','rtmath','rtmem','rtcont','rterror',mlib]),
51  
52   ('ttyimage', ['ttyimage.c'],  ['rtpic','rtio','rtmem']),
53   )
# Line 67 | Line 57 | for p in PROGS:
57      progs.append(prog)
58  
59  
60 < # special targets not normally built
61 < SPECIAL = (
62 < # name          files             libs
63 < ('psum',       ['psum.c'],       ['rtpic','rtio']),
64 < #('panim',      ['panim.c'],      ['client','rpcsvc']),# missing externals
60 > # tiff library (building it is unix-specific for the moment)
61 > #  If we haven't found one supporting LogLuv installed, build our own.
62 > libtiff_fn = radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX'])
63 > if os.name == 'posix' and not env.get('TIFFLIB_INSTALLED'):
64 >        cwd = os.getcwd()
65 >        upperdir = os.path.split(cwd)[0]
66 >        libtiff = env.Command(libtiff_fn, 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 < ('ra_im',      ['ra_im.c'],      ['rtproc','rtpath','rtio','rterror']),
83 >        env['TIFFLIB_INSTALLED'] = 1
84  
85 < #('aedimage',   Split('aedimage.c')+[ciq, cut, closest],[]),# missing externals
86 < ('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)
85 > if os.name == 'posix': # cleanup action for a previously built tifflib
86 >        Clean(libtiff_fn, [libtiff_fn, radlib(env['LIBPREFIX'] + 'tiff.la')])
87  
88 <
89 < # tiff library (unix-specific for the moment)
97 < if os.name == 'posix':
98 <        cwd = os.getcwd()
99 <        libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']),
100 <                'tiff/config.local',
101 <        [('cd "%s"; '
102 <        'sh ./configure -quiet -noninteractive '
103 <                '-with-CC="$CC" -with-ENVOPTS="$CCFLAGS"; '
104 <        'cd libtiff; '
105 <        'make install;') % os.path.join(cwd, 'tiff')])
106 <
88 > if env.get('TIFFLIB_INSTALLED'):
89 >        libtiff = env.get('RAD_LIBTIFF')
90          # tiff programs
91 <        ra_tiff = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
92 <                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
91 >        tiffi = env.get('RAD_TIFFINCLUDE')
92 >        if tiffi: tiffincl = [tiffi] + env.get('CPPPATH', [])
93 >        else: tiffincl = env.get('CPPPATH', [])
94 >        tiffl = env.get('RAD_TIFFLIB')
95 >        if tiffl: tifflib = [tiffl] + env.get('LIBPATH', [])
96 >        else: tifflib = env.get('LIBPATH', [])
97 >
98 >        ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'],
99 >                CPPPATH = tiffincl, LIBPATH=tifflib,
100 >                LIBS=[libtiff,'rtpic','rtio','rtmem'] + mlib)
101          progs.append(ra_tiff)
102  
103 <        normtiff = env.Program(target=radbin('normtiff'), source=Split('normtiff.c'),
104 <                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
103 >        normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'],
104 >                CPPPATH = tiffincl, LIBPATH=tifflib,
105 >                LIBS=[libtiff,'rtpic','rtio','rtmem', 'rtproc', 'rtpath', 'rterror'] + mlib)
106          progs.append(normtiff)
107  
108  
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
109   # X11 targets
110   if env.has_key('X11LIB'):
111 <    xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
112 <    xlibp = env.get('LIBPATH', []) + ['$X11LIB']
113 <    xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem']
114 <    x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
115 <        CPPPATH=xincl)
111 >        xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
112 >        xlibp = env.get('LIBPATH', []) + ['$X11LIB']
113 >        xlibs = ['X11','rtpic','rtargs','rtio','rtmath','rtmem']
114 >        env.x11findwind = env.Object(source='../common/x11findwind.c', # XXX remote magic
115 >                CPPPATH=xincl)
116  
117 <    ximage = env.Program(target=radbin('ximage'),
118 <        source=Split('x11image.c x11raster.c')+[clrtab],
119 <        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
120 <    progs.append(ximage)
117 >        ximage = env.Program(target=radbin('ximage'),
118 >                source=Split('x11image.c x11raster.c')+[clrtab],
119 >                CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
120 >        progs.append(ximage)
121  
122 <    xshowtrace = env.Program(target=radbin('xshowtrace'),
123 <        source=Split('xshowtrace.c') + [x11findwind],
124 <        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
125 <    progs.append(xshowtrace)
122 >        xshowtrace = env.Program(target=radbin('xshowtrace'),
123 >                source=Split('xshowtrace.c') + [env.x11findwind], # XXX remote magic
124 >                CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
125 >        progs.append(xshowtrace)
126  
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
127   if os.name == 'posix': # XXX ignoring trad.wsh
128 <        for s in Split('''normpat falsecolor pdfblur
129 <                        pmblur xyzimage phisto pdelta pgblur'''):
130 <                Default(env.InstallCsh(radbin(s), s + '.csh'))
128 >        for s in Split('''normpat pdfblur pmblur pmdblur
129 >                        xyzimage phisto pdelta pgblur ra_pfm ran2tiff pbilat'''):
130 >                Default(env.InstallScript(radbin(s), s + '.csh'))
131 >        for s in Split('''falsecolor'''):
132 >                Default(env.InstallScript(radbin(s), s + '.pl'))
133 > # XXX probably needs fixing
134 > #else:
135 > #       for s in Split('''falsecolor'''):
136 > #               Default(env.InstallScript(radbin(s), s + '.pl'))
137 > # ignored by Rmakefile: pacuity phisteq psquish pveil vlpic
138  
139   Default('#src/px')
140   env.Install('$RAD_BINDIR', progs)
141  
142 + # vim: set syntax=python:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines