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.2 by schorsch, Mon Oct 27 10:35:43 2003 UTC vs.
Revision 1.4 by schorsch, Thu Jan 1 20:54:46 2004 UTC

# Line 23 | Line 23 | ambio = env.Object(source="ambio.c")
23   RAY = Split('''ambcomp.c ambient.c freeobjmem.c initotypes.c preload.c
24                  raytrace.c renderopts.c Version.c''') + [ambio]
25  
26 < SURF = Split('''sphere.c source.c srcsupp.c virtuals.c o_face.c
27 <                srcsamp.c o_cone.c o_instance.c o_mesh.c''')
26 > SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
27 >                o_face.c o_cone.c o_instance.c o_mesh.c''')
28  
29   MAT = Split('''aniso.c normal.c m_clip.c glass.c m_brdf.c m_mirror.c
30                  m_direct.c m_mist.c fprism.c m_alias.c''') + [dielectric]
# Line 65 | Line 65 | rpict = env.Program(target=radbin('rpict'), source=rps
65   Default(rpict)
66   env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rpict)])
67  
68 < if env.has_key('X11LIB'): # lots of special requirements for rview
68 > if env.has_key('X11LIB'): # lots of special requirements for rvu
69          x11incls = [env['X11INCLUDE']] + env['CPPPATH']
70          x11 = env.Object(source='x11.c', CPPPATH=x11incls)
71          x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
# Line 77 | Line 77 | if env.has_key('X11LIB'): # lots of special requiremen
77          devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
78          rvobjs = [x11, x11twind, rv3, rvmain, rlib]
79          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
80 <        rview = env.Program(target=radbin('rview'), source=rvsrc,
80 >        rvu = env.Program(target=radbin('rvu'), source=rvsrc,
81                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
82                  LIBS=fullib + ['X11'] + mlib)
83 <        Default(rview)
84 <        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rview)])
83 >        Default(rvu)
84 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rvu)])
85  
86   LIBFILES = Split('rayinit.cal')
87   env.Append(RAD_RLIBINSTALL=[env.Install(env['RAD_RLIBDIR'], LIBFILES)])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines