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.9 by schorsch, Fri Nov 5 22:15:43 2004 UTC vs.
Revision 1.13 by schorsch, Wed Sep 14 09:26:25 2005 UTC

# Line 13 | Line 13 | def radlib(name): return os.path.join('$RAD_BUILDLIB',
13   warp3d = env.Object(source="warp3d.c")
14   clrtab = env.Object(source="clrtab.c")
15   neuclrtab = env.Object(source="neuclrtab.c")
16 – ciq = env.Object(source="ciq.c")
17 – cut = env.Object(source="cut.c")
18 – closest = env.Object(source="closest.c")
16  
17   # standard targets
18   PROGS = (
# Line 26 | Line 23 | PROGS = (
23          ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtcont','rtmem','rterror']),
24   ('pfilt',    Split('pfilt.c pf2.c pf3.c'),
25          ['rtlamps','rtpic','rtio','rtpath','rtargs','rtmath']),
26 + ('pcwarp',   ['pcwarp.c', warp3d],      
27 +        ['rtpic','rtio','rtcont','rtmem','rterror']),
28   ('pvalue',   ['pvalue.c'],    ['rtpic','rtio','rtargs','rtmath']),
29   ('pcompos',  ['pcompos.c'],   ['rtpic','rtproc','rtpath','rtio','rterror']),
30   ('psign',    ['psign.c'],
# Line 60 | 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 99 | 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 (old)
> Changed lines (new)