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.9 by schorsch, Mon Sep 19 11:30:10 2005 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 43 | Line 45 | else: rcsrc = Split('raycalls.c raypcalls.c')
45   rclib = env.Library(target=radlib('raycalls'), source=rcsrc)
46   Default(rclib)
47  
48 < fullib=['rttrace','rtscene','rtpic','rtfunc','rtproc','rtio','rtmath','rtargs','rtpath','rtcont','rtmem','rterror']
48 > fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtio', 'rtmath',
49 >        'rtargs', 'rtpath', 'rtcont', 'rtmem', 'rterror']
50   # build executables
51   lasrc = ['lookamb.c', ambio]
52   lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
53          LIBS=['rtio', 'rtpic'])
54   Default(lookamb)
55 < env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], lookamb)])
55 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', lookamb)])
56  
57   rtmain = env.Object(source=['rtmain.c'],
58                  CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
59   rtsrc = ['rtrace.c', duphead, persist, rtmain]
60   rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
61 <        LIBS=fullib + ['rtproc'] + mlib) # rtproc for win_nice()
61 >        LIBS=fullib + mlib
62 >        )
63   Default(rtrace)
64 < env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rtrace)])
64 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rtrace)])
65  
66   rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
67   rpict = env.Program(target=radbin('rpict'), source=rpsrc,
68 <        LIBS=fullib+['rtnet']+mlib)
68 >        LIBS=fullib+['rtnet','$RAD_SOCKETLIB']+mlib)
69   Default(rpict)
70 < env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rpict)])
70 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
71  
72 < if env.has_key('X11LIB'): # lots of special requirements for rview
72 > if env.has_key('X11LIB'): # lots of special requirements for rvu
73          x11incls = [env['X11INCLUDE']] + env['CPPPATH']
74          x11 = env.Object(source='x11.c', CPPPATH=x11incls)
75          x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
76          rvmain = env.Object(source='rvmain.c',
77                  CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
78 <        rv3 = env.Object(source='rv3.c', # XXX we should get rid of SPEED
79 <                CCFLAGS=env['CCFLAGS'] + [env.get('RAD_SPEED', '')])
78 >        rv3 = env.Object(source='rv3.c',
79 >                CCFLAGS=env['CCFLAGS']
80 >                )
81  
82          devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
83          rvobjs = [x11, x11twind, rv3, rvmain, rlib]
84          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
85 <        rview = env.Program(target=radbin('rview'), source=rvsrc,
85 >        rvu = env.Program(target=radbin('rvu'), source=rvsrc,
86                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
87                  LIBS=fullib + ['X11'] + mlib)
88 <        Default(rview)
89 <        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rview)])
88 >        Default(rvu)
89 >        env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])
90  
91   LIBFILES = Split('rayinit.cal')
92 < env.Append(RAD_RLIBINSTALL=[env.Install(env['RAD_RLIBDIR'], LIBFILES)])
92 > env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
93  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines