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.5 by schorsch, Fri Nov 5 22:15:43 2004 UTC vs.
Revision 1.6 by schorsch, Mon Sep 12 14:44:09 2005 UTC

# Line 6 | Line 6 | Import ('env')
6   mlib = env['RAD_MLIB']
7  
8   # compose paths
9 < def radbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
10 < def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
11 < def mgfsf(src): return map(lambda s:os.path.join('mgflib', s), src)
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)
12  
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(radlib('mgf'), source=mgfsf(MGFSRC))
16 > libmgf = env.StaticLibrary(rlib('mgf'), source=mgfs(MGFSRC))
17 >
18   MGFPROGS = (
19   ('mgfilt',  Split('mgfilt.c')),
20   ('mgf2inv', Split('mgf2inv.c cvrgb.c')),
21   ('3ds2mgf', Split('3ds2mgf.c rayopt.c vect.c')),
22   )
23   for p in MGFPROGS:
24 <        prog = env.Program(target=radbin(p[0]), source=mgfsf(p[1]) + [libmgf],
24 <                        LIBS=mlib)
24 >        prog = env.Program(target=rbin(p[0]), source=mgfs(p[1]), LIBS=mlib+['mgf'])
25          Default(prog)
26          env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
27  
# Line 42 | Line 42 | PROGS = [
42      'rtscene','rtio','rtcolor','rtcont','rtmem','rterror'] + mlib),
43   ]
44   for p in PROGS:
45 <        prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2])
45 >        prog = env.Program(target=rbin(p[0]), source=p[1], LIBS=p[2])
46          Default(prog)
47          env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
48  
49   # meta targets
50 < prog = env.Program(target=radbin('mgf2meta'), source=['mgf2meta.c'],
50 > prog = env.Program(target=rbin('mgf2meta'), source=['mgf2meta.c'],
51                  CPPPATH=env.get('CPPPATH', []) + [os.path.join('#src','meta')],
52                  LIBS=['meta','rtmath','rtcont','rtmem','rterror','mgf'] + mlib)
53  
54 < LIBFILES = Split('source.cal tilt.cal')# lamp.tab')
54 > LIBFILES = Split('source.cal tilt.cal lamp.tab')
55   env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))
56  
57  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines