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.14 by schorsch, Sat Sep 17 07:45:11 2005 UTC vs.
Revision 1.23 by schorsch, Thu Mar 10 21:43:23 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")
# Line 16 | Line 15 | neuclrtab = env.Object(source="neuclrtab.c")
15  
16   # standard targets
17   PROGS = (
18 < # name          files            libs
19 < ('macbethcal', Split('macbethcal.c pmapgen.c mx3.c')+[warp3d],
20 <        ['rtpic','rtproc','rtpath','rtio','rtargs','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']),
23 < ('pfilt',    Split('pfilt.c pf2.c pf3.c'),
24 <        ['rtlamps','rtpic','rtio','rtpath','rtargs','rtmath']),
25 < ('pcwarp',   ['pcwarp.c', warp3d],      
26 <        ['rtpic','rtio','rtcont','rtmem','rterror']),
27 < ('pvalue',   ['pvalue.c'],    ['rtpic','rtio','rtargs','rtmath']),
28 < ('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
29 < ('psign',    ['psign.c'],
30 <        ['rtpic','rtscene','rtio','rtpath','rtargs','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']),
37 < ('pinterp',  ['pinterp.c'],
38 <        ['rtproc','rtpic','rtio','rtpath','rtargs','rtmath','rtmem','rterror']),
18 > # name       files            libs
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','rtio','rtargs','rtmem']),
34 < ('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
35 < ('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtproc','rtio','rtmem']),
36 < ('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
37 < ('ra_t16',   ['ra_t16.c'],    ['rtpic','rtio','rtmem']),
38 < ('ra_rgbe', ['ra_rgbe.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
39 < ('ra_pict',  ['ra_pict.c'],   ['rtpic','rtio','rtmem']),
40 < ('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']),
41 < ('ra_xyze',  ['ra_xyze.c'],   ['rtpic','rtio','rtmem']),
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 56 | Line 49 | for p in PROGS:
49      progs.append(prog)
50  
51  
52 < # tiff library (unix-specific for the moment)
53 < if os.name == 'posix':
52 > # tiff library (building it is unix-specific for the moment)
53 > #  If we haven't found one supporting LogLuv installed, build our own.
54 > libtiff_fn = radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX'])
55 > if os.name == 'posix' and not env.get('TIFFLIB_INSTALLED'):
56          cwd = os.getcwd()
57          upperdir = os.path.split(cwd)[0]
58 <
64 <        libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']),
65 <                None,
58 >        libtiff = env.Command(libtiff_fn, None,
59          [('cd "%(tiffdir)s"; '
60                  'env CC="$CC" '
61 <                './configure -C '#-with-CC="$CC" '
61 >                './configure -C '
62                  '"libdir=%(upperdir)s/lib" '
63                  '--enable-static --disable-shared --disable-cxx '
64 <                '--enable-logluv --disable-jpeg '
72 <        '--disable-zlib --disable-pixarlog; '
64 >                '--enable-logluv --disable-jpeg --disable-zlib --disable-pixarlog; '
65                  'cd %(portdir)s; make all;'
66                  'cd %(libtiffdir)s; make install-exec;' # don't install headers
67           ) % {
# Line 80 | Line 72 | if os.name == 'posix':
72          }
73          ])
74  
75 < #       libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']),
84 < #               'tiff/config.local',
85 < #       [('cd "%s"; '
86 < #       'sh ./configure -quiet -noninteractive '
87 < #               '-with-CC="$CC" -with-ENVOPTS="$CCFLAGS"; '
88 < #       'cd libtiff; '
89 < #       'make install;') % os.path.join(cwd, 'tiff')])
75 >        env['TIFFLIB_INSTALLED'] = 1
76  
77 + if os.name == 'posix': # cleanup action for a previously built tifflib
78 +        Clean(libtiff_fn, [libtiff_fn, radlib(env['LIBPREFIX'] + 'tiff.la')])
79 +
80 + if env.get('TIFFLIB_INSTALLED'):
81 +        libtiff = env.get('RAD_LIBTIFF')
82          # tiff programs
83 <        ra_tiff = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
84 <                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
83 >        tiffi = env.get('RAD_TIFFINCLUDE')
84 >        if tiffi: tiffincl = [tiffi] + env.get('CPPPATH', [])
85 >        else: tiffincl = env.get('CPPPATH', [])
86 >        tiffl = env.get('RAD_TIFFLIB')
87 >        if tiffl: tifflib = [tiffl] + env.get('LIBPATH', [])
88 >        else: tifflib = env.get('LIBPATH', [])
89 >
90 >        ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'],
91 >                CPPPATH = tiffincl, LIBPATH=tifflib,
92 >                LIBS=[libtiff,'rtrad'] + mlib)
93          progs.append(ra_tiff)
94  
95 <        normtiff = env.Program(target=radbin('normtiff'), source=Split('normtiff.c'),
96 <                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
95 >        normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'],
96 >                CPPPATH = tiffincl, LIBPATH=tifflib,
97 >                LIBS=[libtiff,'rtrad'] + mlib)
98          progs.append(normtiff)
99  
100  
101   # X11 targets
102   if env.has_key('X11LIB'):
103 <    xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
104 <    xlibp = env.get('LIBPATH', []) + ['$X11LIB']
105 <    xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem']
106 <    x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
107 <        CPPPATH=xincl)
103 >        xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
104 >        xlibp = env.get('LIBPATH', []) + ['$X11LIB']
105 >        xlibs = ['X11','rtrad']
106 >        env.x11findwind = env.Object(source='../common/x11findwind.c', # XXX remote magic
107 >                CPPPATH=xincl)
108  
109 <    ximage = env.Program(target=radbin('ximage'),
110 <        source=Split('x11image.c x11raster.c')+[clrtab],
111 <        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
112 <    progs.append(ximage)
109 >        ximage = env.Program(target=radbin('ximage'),
110 >                source=Split('x11image.c x11raster.c')+[clrtab],
111 >                CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
112 >        progs.append(ximage)
113  
114 <    xshowtrace = env.Program(target=radbin('xshowtrace'),
115 <        source=Split('xshowtrace.c') + [x11findwind],
116 <        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
117 <    progs.append(xshowtrace)
114 >        xshowtrace = env.Program(target=radbin('xshowtrace'),
115 >                source=Split('xshowtrace.c') + [env.x11findwind], # XXX remote magic
116 >                CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
117 >        progs.append(xshowtrace)
118  
119   if os.name == 'posix': # XXX ignoring trad.wsh
120 <        for s in Split('''normpat falsecolor pdfblur pmblur pmdblur
121 <                        xyzimage phisto pdelta pgblur ra_pfm ran2tiff'''):
122 <                Default(env.InstallCsh(radbin(s), s + '.csh'))
120 >        for s in Split('''normpat pdfblur pmblur pmdblur
121 >                        xyzimage phisto pdelta pgblur ra_pfm ran2tiff pbilat'''):
122 >                Default(env.InstallScript(radbin(s), s + '.csh'))
123 >        for s in Split('''falsecolor'''):
124 >                Default(env.InstallScript(radbin(s), s + '.pl'))
125   # XXX probably needs fixing
126   #else:
127   #       for s in Split('''falsecolor'''):
128 < #               Default(env.InstallCsh(radbin(s), s + '.csh'))
128 > #               Default(env.InstallScript(radbin(s), s + '.pl'))
129   # ignored by Rmakefile: pacuity phisteq psquish pveil vlpic
130  
131   Default('#src/px')
132   env.Install('$RAD_BINDIR', progs)
133  
134 + # vim: set syntax=python:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines