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.12 by schorsch, Mon Sep 12 14:44:09 2005 UTC vs.
Revision 1.14 by schorsch, Sat Sep 17 07:45:11 2005 UTC

# Line 66 | Line 66 | if os.name == 'posix':
66          [('cd "%(tiffdir)s"; '
67                  'env CC="$CC" '
68                  './configure -C '#-with-CC="$CC" '
69 <                '"libdir=%(upperdir)s/lib" "includedir=%(upperdir)s/common" '
69 >                '"libdir=%(upperdir)s/lib" '
70                  '--enable-static --disable-shared --disable-cxx '
71                  '--enable-logluv --disable-jpeg '
72          '--disable-zlib --disable-pixarlog; '
73                #'"-with-ENVOPTS=$CCFLAGS"; '
73                  'cd %(portdir)s; make all;'
74 <                'cd %(libtiffdir)s; make install;') % {
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'),
# Line 116 | Line 116 | if env.has_key('X11LIB'):
116          CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
117      progs.append(xshowtrace)
118  
119
119   if os.name == 'posix': # XXX ignoring trad.wsh
120 <        for s in Split('''normpat falsecolor pdfblur
121 <                        pmblur xyzimage phisto pdelta pgblur ra_pfm'''):
120 >        for s in Split('''normpat falsecolor pdfblur pmblur pmdblur
121 >                        xyzimage phisto pdelta pgblur ra_pfm ran2tiff'''):
122                  Default(env.InstallCsh(radbin(s), s + '.csh'))
123   # XXX probably needs fixing
124   #else:
125   #       for s in Split('''falsecolor'''):
126   #               Default(env.InstallCsh(radbin(s), s + '.csh'))
127 + # ignored by Rmakefile: pacuity phisteq psquish pveil vlpic
128  
129   Default('#src/px')
130   env.Install('$RAD_BINDIR', progs)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines