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

Comparing ray/src/rt/SConscript (file contents):
Revision 1.15 by schorsch, Sat Mar 5 00:29:28 2016 UTC vs.
Revision 1.16 by schorsch, Sat Mar 5 13:24:58 2016 UTC

# Line 19 | Line 19 | ambio = env.Object(source="ambio.c")
19   rayfifo = env.Object(source="rayfifo.c")
20   raypwin = env.Object(source="raypwin.c")
21   raycalls = env.Object(source="raycalls.c")
22 + pmaptype = env.Object(source="pmaptype.c")
23 + pmapparm = env.Object(source="pmapparm.c")
24  
25  
26   # source and object dependencies
27   RAY = Split('''ambcomp.c ambient.c freeobjmem.c initotypes.c preload.c
28                  raytrace.c renderopts.c''') + [ambio]
29   PMAP = Split('''pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c
30 <        pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c
31 <        pmapdiag.c pmaptype.c''')
30 >        pmapbias.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c pmapdiag.c '''
31 >                ) + [pmaptype, pmapparm]
32  
33   SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
34                  o_face.c o_cone.c o_instance.c o_mesh.c''')
# Line 44 | Line 46 | rsrc = RAY + PMAP + SURF + MAT + MOD + SUP
46   env.Command('Version.c', 'VERSION', vstamp.build_version_c)
47   env.Depends('Version.c', rsrc)
48   Version = env.Object(source=['Version.c'])
49 + env.version = Version # make it remotely accessible
50   rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
51  
52   #if os.name == 'nt': # XXX until we get around fork() and friends
# Line 56 | Line 59 | Default(rclib)
59   fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
60          'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror']
61   # build executables
62 + mkpmap = env.Program(target=radbin('mkpmap'),
63 +                source = Split('mkpmap.c') + [Version],
64 +                LIBS= fullib + ['rtnet', '$RAD_SOCKETLIB', mlib]),
65 + Default(mkpmap)
66 + env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', mkpmap)])
67 +
68 + pmapdump = env.Program(target=radbin('pmapdump'),
69 +                source = Split('pmapdump.c') + [pmaptype, pmapparm, Version],
70 +                LIBS= fullib + ['$RAD_SOCKETLIB', mlib]),
71 + Default(pmapdump)
72 + env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', pmapdump)])
73 +
74   lasrc = ['lookamb.c', ambio]
75   lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
76          LIBS=['rtio', 'rtpic', 'rtmath', mlib])
# Line 64 | Line 79 | env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR',
79  
80   rcontrib = env.Program(target=radbin('rcontrib'),
81                  source = Split('rcmain.c rcontrib.c rc2.c rc3.c') + [Version],
82 <                LIBS= ['rttrace','rtscene','rtpic','rtargs','rtfunc','rtio',
83 <                'rtproc','rtcont',
84 <                'rtmem', 'rtpath', 'rtmath','rtnet','rterror','$RAD_SOCKETLIB',mlib]),
82 >                LIBS= fullib + ['rtnet', '$RAD_SOCKETLIB', mlib]),
83 > #               LIBS= ['rttrace','rtscene','rtpic','rtargs','rtfunc','rtio',
84 > #               'rtproc','rtcont',
85 > #               'rtmem', 'rtpath', 'rtmath','rtnet','rterror','$RAD_SOCKETLIB',mlib]),
86   Default(rcontrib)
87   env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rcontrib)])
88  
# Line 112 | Line 128 | if env.has_key('X11LIB'): # lots of special requiremen
128   LIBFILES = Split('rayinit.cal')
129   env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
130  
131 + # vim: set syntax=python:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines