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

Comparing ray/src/ot/SConscript (file contents):
Revision 1.6 by schorsch, Sat Mar 5 13:24:58 2016 UTC vs.
Revision 1.9 by schorsch, Fri Mar 18 22:57:24 2016 UTC

# Line 4 | Line 4 | Import('env') # inherit from parent
4  
5   # math libs
6   mlib = env['RAD_MLIB']
7 + addobj = env.get('ADDOBJNOTIFY')
8  
9   # standard targets
10 < env.Object(source='bbox.c')
11 < env.Object(source='o_face.c')
10 > bbox = env.Object(source='bbox.c')
11 > o_face = env.Object(source='o_face.c')
12   PROGS = (
13 < ('oconv',    Split('''oconv.c writeoct.c bbox.o initotypes.c
14 <                                   sphere.c o_face.o o_cone.c o_instance.c'''), []),
15 < ('getbbox',  Split('getbbox.c readobj2.c bbox.o init2otypes.c'), []),
16 < ('obj2mesh', Split('obj2mesh.c cvmesh.c wfconv.c o_face.o writemesh.c'),
17 <         ['rtdummy']),
13 > ('oconv',    Split('''oconv.c writeoct.c initotypes.c sphere.c
14 >                                   o_cone.c o_instance.c''') +[bbox, o_face], []),
15 > ('getbbox',  Split('getbbox.c readobj2.c init2otypes.c') +[bbox], []),
16 > ('obj2mesh', Split('obj2mesh.c cvmesh.c wfconv.c writemesh.c')+[o_face,addobj],
17 > []),
18   )
19   for p in PROGS:
20      prog = env.Program(target=os.path.join(env['RAD_BUILDBIN'], p[0]),
21 <                        source=p[1], LIBS=['rtproc','rtscene','rtpath','rtio','rtmath',
21 <                        'rtargs','rtcont','rtmem','rterror','rtproc']+p[2]+mlib)
21 >                        source=p[1], LIBS=['rtrad']+p[2]+mlib)
22      Default(prog)
23      env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
24  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines