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.5 by schorsch, Sun Jul 4 12:08:48 2004 UTC vs.
Revision 1.17 by schorsch, Thu Mar 10 21:43:23 2016 UTC

# Line 16 | Line 16 | dielectric = env.Object(source='dielectric.c',
16   duphead = env.Object(source="duphead.c")
17   persist = env.Object(source="persist.c")
18   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 <
29 > PMAP = Split('''pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c
30 >        pmapbias.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c pmapdiag.c '''
31 >                ) + [pmaptype, pmapparm]
32   SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
33                  o_face.c o_cone.c o_instance.c o_mesh.c''')
27
34   MAT = Split('''aniso.c normal.c m_clip.c glass.c m_brdf.c m_mirror.c
35 <                m_direct.c m_mist.c fprism.c m_alias.c''') + [dielectric]
36 <
35 >                m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c ashikhmin.c '''
36 >                ) + [dielectric]
37   MOD = Split('p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c')
32
38   SUP = Split('func.c noise3.c data.c')
39  
40   # build libraries
41 < rsrc = RAY + SURF + MAT + MOD + SUP
41 > rsrc = RAY + PMAP + SURF + MAT + MOD + SUP
42   env.Command('Version.c', 'VERSION', vstamp.build_version_c)
43   env.Depends('Version.c', rsrc)
44 < Version = env.Object(source='Version.c')
44 > Version = env.Object(source=['Version.c'])
45 > env.version = Version # make it remotely accessible
46   rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
47  
48 < if os.name == 'nt': # XXX until we get around fork() and friends
49 <        rcsrc = Split('raycalls.c')
44 < else: rcsrc = Split('raycalls.c raypcalls.c')
45 < rclib = env.Library(target=radlib('raycalls'), source=rcsrc)
48 > rclib = env.Library(target=radlib('raycalls'),
49 >                source=Split('raycalls.c $RAD_PCALLS'))
50   Default(rclib)
51  
48 fullib=['rttrace','rtscene','rtpic','rtfunc','rtproc','rtio','rtmath','rtargs','rtpath','rtcont','rtmem','rterror']
49 # build executables
50 lasrc = ['lookamb.c', ambio]
51 lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
52        LIBS=['rtio', 'rtpic'])
53 Default(lookamb)
54 env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], lookamb)])
55
52   rtmain = env.Object(source=['rtmain.c'],
53                  CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
58 rtsrc = ['rtrace.c', duphead, persist, rtmain]
59 rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
60        LIBS=fullib + ['rtproc'] + mlib) # rtproc for win_nice()
61 Default(rtrace)
62 env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rtrace)])
54  
55 < rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
56 < rpict = env.Program(target=radbin('rpict'), source=rpsrc,
57 <        LIBS=fullib+['rtnet']+mlib)
58 < Default(rpict)
59 < env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rpict)])
55 > # build executables
56 > PROGS = [
57 > ('mkpmap',   ['mkpmap.c', Version],
58 >         ['rttrace', 'rtrad', '$RAD_SOCKETLIB', mlib]),
59 > ('pmapdump', ['pmapdump.c', pmaptype, pmapparm, Version],
60 >         ['rtrad', '$RAD_SOCKETLIB', mlib]),
61 > ('lookamb',  ['lookamb.c', ambio], ['rtrad', mlib]),
62 > ('rcontrib', Split('rcmain.c rcontrib.c rc2.c rc3.c') + [Version],
63 >         ['rttrace', 'rtrad', '$RAD_SOCKETLIB', mlib]),
64 > ('rtrace',   ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls],
65 >         ['rttrace', 'rtrad'] +  mlib),
66 > ('rpict',    Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist],
67 >         ['rttrace', 'rtrad', '$RAD_SOCKETLIB']+mlib),
68 > ]
69 > for p in PROGS:
70 >        prog = env.Program(target=radbin(p[0]), source = p[1], LIBS = p[2]),
71 >        Default(prog)
72 >        env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', prog)])
73  
74 +
75   if env.has_key('X11LIB'): # lots of special requirements for rvu
76          x11incls = [env['X11INCLUDE']] + env['CPPPATH']
77          x11 = env.Object(source='x11.c', CPPPATH=x11incls)
78          x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
79          rvmain = env.Object(source='rvmain.c',
80                  CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
81 <        rv3 = env.Object(source='rv3.c', # XXX we should get rid of SPEED
82 <                CCFLAGS=env['CCFLAGS'] + [env.get('RAD_SPEED', '')])
81 >        rv3 = env.Object(source='rv3.c',
82 >                CCFLAGS=env['CCFLAGS']
83 >                )
84  
85          devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
86          rvobjs = [x11, x11twind, rv3, rvmain, rlib]
87          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
88          rvu = env.Program(target=radbin('rvu'), source=rvsrc,
89                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
90 <                LIBS=fullib + ['X11'] + mlib)
90 >                LIBS = ([rclib, 'rttrace', 'rtrad', 'X11'] + mlib)
91 >                )
92          Default(rvu)
93 <        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rvu)])
93 >        env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])
94  
95   LIBFILES = Split('rayinit.cal')
96 < env.Append(RAD_RLIBINSTALL=[env.Install(env['RAD_RLIBDIR'], LIBFILES)])
96 > env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
97  
98 + # vim: set syntax=python:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines