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.13 by schorsch, Wed Sep 14 09:26:25 2005 UTC

# Line 59 | Line 59 | for p in PROGS:
59   # tiff library (unix-specific for the moment)
60   if os.name == 'posix':
61          cwd = os.getcwd()
62 +        upperdir = os.path.split(cwd)[0]
63 +
64          libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']),
65 <                'tiff/config.local',
66 <        [('cd "%s"; '
67 <        'sh ./configure -quiet -noninteractive '
68 <                '-with-CC="$CC" -with-ENVOPTS="$CCFLAGS"; '
69 <        'cd libtiff; '
70 <        'make install;') % os.path.join(cwd, 'tiff')])
65 >                None,
66 >        [('cd "%(tiffdir)s"; '
67 >                'env CC="$CC" '
68 >                './configure -C '#-with-CC="$CC" '
69 >                '"libdir=%(upperdir)s/lib" '
70 >                '--enable-static --disable-shared --disable-cxx '
71 >                '--enable-logluv --disable-jpeg '
72 >        '--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 + #       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')])
90 +
91          # tiff programs
92          ra_tiff = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
93                  LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
# Line 98 | Line 119 | if env.has_key('X11LIB'):
119  
120   if os.name == 'posix': # XXX ignoring trad.wsh
121          for s in Split('''normpat falsecolor pdfblur
122 <                        pmblur xyzimage phisto pdelta pgblur'''):
122 >                        pmblur xyzimage phisto pdelta pgblur ra_pfm'''):
123                  Default(env.InstallCsh(radbin(s), s + '.csh'))
124   # XXX probably needs fixing
125   #else:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines