ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/build_utils/find_libs.py
(Generate patch)

Comparing ray/build_utils/find_libs.py (file contents):
Revision 1.5 by schorsch, Thu Oct 22 21:16:05 2009 UTC vs.
Revision 1.7 by schorsch, Thu Mar 10 01:49:56 2016 UTC

# Line 3 | Line 3 | import os
3   from SCons.SConf import SConf # aka Configure
4  
5   def find_radlib(env):
6 <        v = env.FindFile('Verdana.fnt', './lib')
6 >        v = env.FindFile('helvet.fnt', './lib')
7          if not v:
8                  print '''
9          Radiance auxiliary support files not found.
# Line 61 | Line 61 | def find_libtiff(env):
61          dl = [ (None,None), ] # standard search path
62          cfgi = env.get('TIFFINCLUDE')
63          cfgl = env.get('TIFFLIB')
64 +        #print('TIFFLIB:', cfgl)
65          if cfgi or cfgl:
66                  dl.insert(0,(cfgi, cfgl))
67          for incdir, libdir in dl:
68                  if incdir: env.Prepend(CPPPATH=[incdir]) # add temporarily
69                  if libdir: env.Prepend(LIBPATH=[libdir])
70                  conf = SConf(env)
71 <                if conf.CheckLib('tiff', 'TIFFInitSGILog',
72 <                                header='void TIFFInitSGILog(void);', autoadd=0):
71 >                libname = 'tiff'
72 >                header = 'void TIFFInitSGILog(void);'
73 >                if os.name == 'nt':
74 >                        libname = 'libtiff'
75 >                if conf.CheckLib(libname, 'TIFFInitSGILog',
76 >                                header=header, autoadd=0):
77                          env['TIFFLIB_INSTALLED'] = 1
78                  if incdir: env['CPPPATH'].remove(incdir) # not needed for now
79                  if libdir: env['LIBPATH'].remove(libdir)

Diff Legend

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