ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/px/SConscript
(Generate patch)

Comparing ray/src/px/SConscript (file contents):
Revision 1.21 by schorsch, Sat Mar 5 13:24:58 2016 UTC vs.
Revision 1.22 by schorsch, Thu Mar 10 17:36:18 2016 UTC

# Line 86 | Line 86 | if os.name == 'posix': # cleanup action for a previous
86          Clean(libtiff_fn, [libtiff_fn, radlib(env['LIBPREFIX'] + 'tiff.la')])
87  
88   if env.get('TIFFLIB_INSTALLED'):
89 +        libtiff = env.get('RAD_LIBTIFF')
90          # tiff programs
91          tiffi = env.get('RAD_TIFFINCLUDE')
92          if tiffi: tiffincl = [tiffi] + env.get('CPPPATH', [])
# Line 96 | Line 97 | if env.get('TIFFLIB_INSTALLED'):
97  
98          ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'],
99                  CPPPATH = tiffincl, LIBPATH=tifflib,
100 <                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
100 >                LIBS=[libtiff,'rtpic','rtio','rtmem'] + mlib)
101          progs.append(ra_tiff)
102  
103          normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'],
104                  CPPPATH = tiffincl, LIBPATH=tifflib,
105 <                LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
105 >                LIBS=[libtiff,'rtpic','rtio','rtmem', 'rtproc', 'rtpath', 'rterror'] + mlib)
106          progs.append(normtiff)
107  
108  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)