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.10 by schorsch, Mon Nov 8 19:24:46 2004 UTC vs.
Revision 1.18 by schorsch, Sun Apr 27 17:22:49 2008 UTC

# Line 16 | Line 16 | neuclrtab = env.Object(source="neuclrtab.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']),
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  
40   ('ra_gif',   ['ra_gif.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
41 < ('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','rtproc','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']),
47   ('ra_rgbe', ['ra_rgbe.c'],['rtpic','rtproc','rtpath','rtio','rtmem','rterror']),
# Line 59 | Line 60 | for p in PROGS:
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  
# Line 81 | Line 94 | if os.name == 'posix':
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 95 | Line 108 | if env.has_key('X11LIB'):
108          CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
109      progs.append(xshowtrace)
110  
98
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