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.19 by schorsch, Mon Jan 8 13:38:37 2018 UTC vs.
Revision 1.20 by schorsch, Tue Jan 9 00:08:57 2018 UTC

# Line 21 | Line 21 | ambio = env.Object(source="ambio.c")
21   rayfifo = env.Object(source="rayfifo.c")
22   raypwin = env.Object(source="raypwin.c")
23   raycalls = env.Object(source="raycalls.c")
24 pmaptype = env.Object(source="pmaptype.c")
25 pmapparm = env.Object(source="pmapparm.c")
24  
25 + CCFLAGS = env.get('CCFLAGS',[])
26 + if env.get('PMAP_OOC', 0) not in (0,'0','','n','no','false',False,None):
27 +        PMD = Split('ooccache.c oocnn.c oocmorton.c oococt.c oocsort.c oocbuild.c')
28 +        OOC_CCFLAGS = env.get('CCFLAGS',[]) + ['-DPMAP_OOC']
29 +        for src in Split('''pmapdata.c pmapio.c pmapopt.c '''):
30 +                obj = env.Object(source=src, CCFLAGS=OOC_CCFLAGS)
31 +                PMD.append(obj)
32 +        pmaptype = env.Object(source="pmaptype.c", CCFLAGS=OOC_CCFLAGS)
33 +        pmapparm = env.Object(source="pmapparm.c", CCFLAGS=OOC_CCFLAGS)
34 + else:
35 +        PMD = Split('''pmapdata.c pmapio.c pmapopt.c ''')
36 +        OOC_CCFLAGS = env.get('CCFLAGS',[])
37 +        pmaptype = env.Object(source="pmaptype.c")
38 +        pmapparm = env.Object(source="pmapparm.c")
39  
40   # source and object dependencies
41   RAY = Split('''ambcomp.c ambient.c freeobjmem.c initotypes.c preload.c
42                  raytrace.c renderopts.c''') + [ambio]
43 < PMAP = Split('''pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c
44 <        pmapbias.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c pmapdiag.c
45 <                oocbuild.c ooccache.c oocnn.c oocmorton.c oococt.c oocsort.c
34 <                pmcontrib2.c pmapkdt.c pmutil.c
43 > PMAP = Split('''pmap.c pmapsrc.c pmapmat.c pmaprand.c
44 >        pmapbias.c pmapcontrib.c pmapamb.c pmapray.c pmapdiag.c
45 >                pmcontrib2.c pmutil.c
46                  ''') + [pmaptype, pmapparm]
36 # not ready yet: pmapooc.c
47   SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
48                  o_face.c o_cone.c o_instance.c o_mesh.c''')
49   MAT = Split('''aniso.c normal.c m_clip.c glass.c m_brdf.c m_mirror.c
# Line 43 | Line 53 | MOD = Split('p_func.c t_func.c p_data.c t_data.c text.
53   SUP = Split('func.c noise3.c data.c')
54  
55   # build libraries
56 < rsrc = RAY + PMAP + SURF + MAT + MOD + SUP
56 > rsrc = RAY + PMAP + PMD + SURF + MAT + MOD + SUP
57   env.Command('Version.c', 'VERSION', vstamp.build_version_c)
58   env.Depends('Version.c', rsrc)
59   Version = env.Object(source=['Version.c'])
# Line 59 | Line 69 | rtmain = env.Object(source=['rtmain.c'],
69  
70   # build executables
71   PROGS = [
72 < ('mkpmap',   ['mkpmap.c', Version],
72 > ('mkpmap',   ['mkpmap.c', Version], CCFLAGS,
73           ['rttrace', 'rtrad', '$RAD_SOCKETLIB', mlib]),
74 < ('pmapdump', ['pmapdump.c', pmaptype, pmapparm, Version],
74 > ('pmapdump', ['pmapdump.c', pmaptype, pmapparm, Version], OOC_CCFLAGS,
75           ['rtrad', '$RAD_SOCKETLIB', mlib]),
76 < ('lookamb',  ['lookamb.c', ambio], ['rtrad', mlib]),
77 < ('rcontrib', Split('rcmain.c rcontrib.c rc2.c rc3.c') + [Version],
76 > ('lookamb',  ['lookamb.c', ambio], CCFLAGS, ['rtrad', mlib]),
77 > ('rcontrib', Split('rcmain.c rcontrib.c rc2.c rc3.c') + [Version], CCFLAGS,
78           ['rttrace', 'rtrad', '$RAD_SOCKETLIB', mlib]),
79   ('rtrace',   ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls],
80 <         ['rttrace', 'rtrad'] +  mlib),
81 < ('rpict',    Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist],
80 >         CCFLAGS, ['rttrace', 'rtrad'] +  mlib),
81 > ('rpict',    Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist], CCFLAGS,
82           ['rttrace', 'rtrad', '$RAD_SOCKETLIB']+mlib),
83   ]
84   for p in PROGS:
85 <        prog = env.Program(target=radbin(p[0]), source = p[1], LIBS = p[2]),
85 >        prog = env.Program(target=radbin(p[0]), source = p[1],
86 >                        CCFLAGS = p[2], LIBS = p[3]),
87          Default(prog)
88          env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', prog)])
89  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines