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.9 by schorsch, Mon Sep 19 11:30:10 2005 UTC vs.
Revision 1.11 by schorsch, Tue Dec 23 15:04:01 2008 UTC

# Line 39 | Line 39 | 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')
44 < else: rcsrc = Split('raycalls.c raypcalls.c')
42 > #if os.name == 'nt': # XXX until we get around fork() and friends
43 > #       rcsrc = Split('raycalls.c')
44 > #else: rcsrc = Split('raycalls.c raypcalls.c')
45 > rcsrc = Split('raycalls.c $RAD_PCALLS')
46   rclib = env.Library(target=radlib('raycalls'), source=rcsrc)
47   Default(rclib)
48  
49 < fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtio', 'rtmath',
50 <        'rtargs', 'rtpath', 'rtcont', 'rtmem', 'rterror']
49 > fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
50 >        'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror']
51   # build executables
52   lasrc = ['lookamb.c', ambio]
53   lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
# Line 84 | Line 85 | if env.has_key('X11LIB'): # lots of special requiremen
85          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
86          rvu = env.Program(target=radbin('rvu'), source=rvsrc,
87                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
88 <                LIBS=fullib + ['X11'] + mlib)
88 >                LIBS = (['rtscene', rclib, 'rttrace', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
89 >                        'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror',
90 >                        'X11'] + mlib)
91 >                #LIBS=fullib + ['X11', rclib] + mlib
92 >                )
93          Default(rvu)
94          env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])
95  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines