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

Comparing ray/src/cv/SConscript (file contents):
Revision 1.8 by schorsch, Wed Jun 7 17:52:03 2006 UTC vs.
Revision 1.11 by greg, Fri Apr 15 21:52:16 2011 UTC

# Line 7 | Line 7 | mlib = env['RAD_MLIB']
7  
8   # compose paths
9   def rbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
10 def rlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
11 def mgfs(src): return map(lambda s:os.path.join('mgflib', s), src)
10  
13 MGFSRC = Split('''parser.c context.c xf.c object.c lookup.c badarg.c
14                words.c
15                fvect.c''')
16 libmgf = env.StaticLibrary(rlib('mgf'), source=mgfs(MGFSRC))
17
11   MGFPROGS = (
12 < ('mgfilt',  Split('mgfilt.c')),
20 < ('mgf2inv', Split('mgf2inv.c cvrgb.c')),
21 < ('3ds2mgf', Split('3ds2mgf.c rayopt.c vect.c')),
12 > ('3ds2mgf', Split('3ds2mgf.c rayopt3ds.c vect3ds.c')),
13   )
14   for p in MGFPROGS:
15 <        prog = env.Program(target=rbin(p[0]), source=mgfs(p[1]), LIBS=mlib+['mgf'])
15 >        prog = env.Program(target=rbin(p[0]), source=p[1], LIBS=mlib+['mgf','rtcont'])
16          Default(prog)
17          env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
18  
# Line 34 | Line 25 | PROGS = [
25   ('nff2rad',   ['nff2rad.c'],       []),
26   ('lampcolor', ['lampcolor.c'],     ['rtlamps','rtcolor','rtio','rtpath']),
27   ('tmesh2rad', ['tmesh2rad.c'],     ['rtscene','rtmath'] + mlib),
28 + ('mgf2inv',   ['mgf2inv.c'],       ['mgf','rtall'] + mlib),
29   ('obj2rad',   ['obj2rad.c',trans],
30      ['rtscene','rtargs','rtio','rtcont','rtmem','rtmath','rterror'] + mlib),
31 < ('mgf2rad',   ['mgf2rad.c'],       ['rtscene','rtcolor','mgf'] + mlib),
31 > ('mgf2rad',   ['mgf2rad.c'],       ['mgf','rtall'] + mlib),
32 > ('mgfilt',    ['mgfilt.c'],        ['mgf','rtall'] + mlib),
33   ('rad2mgf',   ['rad2mgf.c'],
34          ['rtproc', 'rtpath', # for win_popen()
35      'rtscene','rtio','rtcolor','rtcont','rtmem','rterror'] + mlib),
# Line 49 | Line 42 | for p in PROGS:
42   # meta targets
43   prog = env.Program(target=rbin('mgf2meta'), source=['mgf2meta.c'],
44                  CPPPATH=env.get('CPPPATH', []) + [os.path.join('#src','meta')],
45 <                LIBS=['meta','rtmath','rtcont','rtmem','rterror','mgf'] + mlib)
45 >                LIBS=['meta','mgf','rtall'] + mlib)
46 > env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
47  
48 < LIBFILES = Split('source.cal tilt.cal lamp.tab window.cal')
48 > LIBFILES = Split('source.cal tilt.cal window.cal')
49   env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))
50  
51   if os.name == 'posix':

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines