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.3 by schorsch, Thu Jan 1 10:57:46 2004 UTC vs.
Revision 1.5 by schorsch, Sun Jul 4 12:08:48 2004 UTC

# Line 1 | Line 1
1   import os
2 + from build_utils import vstamp
3  
4   Import('env') # inherit from parent
5  
# Line 11 | Line 12 | def radlib(name): return os.path.join(env['RAD_BUILDLI
12   # custom compile flags
13   dielectric = env.Object(source='dielectric.c',
14                  CCFLAGS=env.get('CCFLAGS',[]) + ['-DDISPERSE'])
14 # custom C file generation
15 #env.CFile(target='Version.c', source='VERSION', env=build_radversion)
15  
16   duphead = env.Object(source="duphead.c")
17   persist = env.Object(source="persist.c")
# Line 21 | Line 20 | ambio = env.Object(source="ambio.c")
20  
21   # source and object dependencies
22   RAY = Split('''ambcomp.c ambient.c freeobjmem.c initotypes.c preload.c
23 <                raytrace.c renderopts.c Version.c''') + [ambio]
23 >                raytrace.c renderopts.c''') + [ambio]
24  
25   SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
26                  o_face.c o_cone.c o_instance.c o_mesh.c''')
# Line 35 | Line 34 | SUP = Split('func.c noise3.c data.c')
34  
35   # build libraries
36   rsrc = RAY + SURF + MAT + MOD + SUP
37 < rlib = env.Library(target=radlib('rttrace'), source=rsrc)
37 > env.Command('Version.c', 'VERSION', vstamp.build_version_c)
38 > env.Depends('Version.c', rsrc)
39 > Version = env.Object(source='Version.c')
40 > rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
41  
42   if os.name == 'nt': # XXX until we get around fork() and friends
43          rcsrc = Split('raycalls.c')
# Line 65 | Line 67 | rpict = env.Program(target=radbin('rpict'), source=rps
67   Default(rpict)
68   env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rpict)])
69  
70 < if env.has_key('X11LIB'): # lots of special requirements for rview
70 > if env.has_key('X11LIB'): # lots of special requirements for rvu
71          x11incls = [env['X11INCLUDE']] + env['CPPPATH']
72          x11 = env.Object(source='x11.c', CPPPATH=x11incls)
73          x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
# Line 77 | Line 79 | if env.has_key('X11LIB'): # lots of special requiremen
79          devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
80          rvobjs = [x11, x11twind, rv3, rvmain, rlib]
81          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
82 <        rview = env.Program(target=radbin('rview'), source=rvsrc,
82 >        rvu = env.Program(target=radbin('rvu'), source=rvsrc,
83                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
84                  LIBS=fullib + ['X11'] + mlib)
85 <        Default(rview)
86 <        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rview)])
85 >        Default(rvu)
86 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rvu)])
87  
88   LIBFILES = Split('rayinit.cal')
89   env.Append(RAD_RLIBINSTALL=[env.Install(env['RAD_RLIBDIR'], LIBFILES)])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines