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.14 by schorsch, Sun Mar 6 01:13:17 2016 UTC vs.
Revision 1.15 by schorsch, Thu Mar 10 21:43:22 2016 UTC

# Line 8 | Line 8 | mlib = env['RAD_MLIB']
8   # compose paths
9   def rbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
10  
11 MGFPROGS = (
12 ('3ds2mgf', Split('3ds2mgf.c rayopt3ds.c vect3ds.c')),
13 )
14 for p in MGFPROGS:
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
11   trans = env.Object(source="trans.c")
12   bsdfrep = env.Object(source="bsdfrep.c")
13   bsdfinterp = env.Object(source="bsdfinterp.c")
14  
23
15   # standard targets
16   PROGS = [
17 < ('ies2rad',   ['ies2rad.c'],       ['rtlamps','rtcolor','rtio','rtpath']+ mlib),
18 < #('arch2rad',  ['arch2rad.c',trans],['rtcont','rtmem'] + mlib),
17 > ('3ds2mgf', Split('3ds2mgf.c rayopt3ds.c vect3ds.c'), ['mgf','rtrad'] + mlib),
18 > ('ies2rad',   ['ies2rad.c'],       ['rtrad'] + mlib),
19 > #('arch2rad',  ['arch2rad.c',trans],['rtrad'] + mlib),
20   ('nff2rad',   ['nff2rad.c'],       []),
21 < ('lampcolor', ['lampcolor.c'],     ['rtlamps','rtcolor','rtio','rtpath']),
22 < ('tmesh2rad', ['tmesh2rad.c'],     ['rtscene','rtmath'] + mlib),
23 < ('obj2rad',   ['obj2rad.c',trans],
24 <    ['rtscene','rtargs','rtio','rtcont','rtmem','rtmath','rterror'] + mlib),
25 < ('mgf2rad',   ['mgf2rad.c'],       ['mgf','rtall'] + mlib),
26 < ('rad2mgf',   ['rad2mgf.c'],
27 <        ['rtproc', 'rtpath', # for win_popen()
36 <    'rtscene','rtio','rtcolor','rtcont','rtmem','rterror'] + mlib),
37 < ('mgfilt',    ['mgfilt.c'],        ['mgf','rtall'] + mlib),
38 < ('mgf2inv',   ['mgf2inv.c'],       ['mgf','rtall'] + mlib),
21 > ('lampcolor', ['lampcolor.c'],     ['rtrad'] ),
22 > ('tmesh2rad', ['tmesh2rad.c'],     ['rtrad']  + mlib),
23 > ('obj2rad',   ['obj2rad.c',trans], ['rtrad']  + mlib),
24 > ('mgf2rad',   ['mgf2rad.c'],       ['mgf','rtrad']  + mlib),
25 > ('rad2mgf',   ['rad2mgf.c'],       ['rtrad'] + mlib),
26 > ('mgfilt',    ['mgfilt.c'],        ['mgf','rtrad'] + mlib),
27 > ('mgf2inv',   ['mgf2inv.c'],       ['mgf','rtrad'] + mlib),
28   ('pabopto2bsdf',
29          ['pabopto2bsdf.c',bsdfrep,'bsdfrbf.c', 'bsdfmesh.c', 'bsdftrans.cpp',],
30 <        ['rtall'] + mlib),
31 < ('bsdf2klems',['bsdf2klems.c', bsdfrep, bsdfinterp,], ['rtall'] + mlib),
32 < ('bsdf2ttree',['bsdf2ttree.c', bsdfrep, bsdfinterp,], ['rtall'] + mlib),
33 < ('pkgBSDF',   ['pkgBSDF.c', ], ['rtall'] + mlib),
34 < ('epw2wea',   ['epw2wea.c', ], ['rtall'] + mlib),
30 >        ['rtrad'] + mlib),
31 > ('bsdf2klems',['bsdf2klems.c', bsdfrep, bsdfinterp,], ['rtrad'] + mlib),
32 > ('bsdf2ttree',['bsdf2ttree.c', bsdfrep, bsdfinterp,], ['rtrad'] + mlib),
33 > ('pkgBSDF',   ['pkgBSDF.c', ], ['rtrad'] + mlib),
34 > ('epw2wea',   ['epw2wea.c', ], ['rtrad'] + mlib),
35 > ('mgf2meta',  ['mgf2meta.c'],  ['meta', 'mgf','rtrad'] + mlib,
36 >        [os.path.join('#src','meta')]),
37   ]
38   for p in PROGS:
39 <        prog = env.Program(target=rbin(p[0]), source=p[1], LIBS=p[2])
39 >        if len(p) == 4: inclp = env.get('CPPPATH', []) + [os.path.join('#src','meta')],
40 >        else: inclp = env.get('CPPPATH', [])
41 >        prog = env.Program(target=rbin(p[0]), source=p[1], LIBS=p[2], CPPPATH=inclp)
42          Default(prog)
43          env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
51
52 # meta targets
53 prog = env.Program(target=rbin('mgf2meta'), source=['mgf2meta.c'],
54                CPPPATH=env.get('CPPPATH', []) + [os.path.join('#src','meta')],
55                LIBS=['meta','mgf','rtall'] + mlib)
56 env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
44  
45   LIBFILES = Split('source.cal tilt.cal window.cal')
46   env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines