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.2 by schorsch, Mon Oct 27 10:35:43 2003 UTC vs.
Revision 1.6 by schorsch, Tue Jul 6 11:49:09 2004 UTC

# Line 48 | Line 48 | PROGS = (
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']),
# Line 96 | Line 97 | if os.name == 'posix':
97          cwd = os.getcwd()
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 = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
# Line 116 | Line 118 | if os.name == 'posix':
118   # pixar format requires extra 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']])
121 >        LIBS=['rtpic', env['PIXAR_LIB']])
122      Default(ra_pixar)
123      env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ra_pixar)])
124  
125  
126   # X11 targets
127   if env.has_key('X11LIB'):
128 <    xcppp = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
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 = env.Program(target=radbin('ximage'),
135          source=Split('x11image.c x11raster.c')+[clrtab],
136 <        CPPPATH=xcppp, LIBPATH=xlibp, LIBS=xlibs + mlib)
136 >        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
137      Default(ximage)
138      env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ximage)])
139  
140      xshowtrace = env.Program(target=radbin('xshowtrace'),
141 <        source=Split('xshowtrace.c x11findwind.c'),
142 <        CPPPATH=xcppp, LIBPATH=xlibp, LIBS=xlibs + mlib)
141 >        source=Split('xshowtrace.c') + [x11findwind],
142 >        CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
143      Default(xshowtrace)
144      env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xshowtrace)])
145  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines