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.6 by schorsch, Thu Oct 21 15:47:13 2004 UTC vs.
Revision 1.9 by schorsch, Mon Sep 19 11:30:10 2005 UTC

# Line 45 | 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,
# Line 64 | Line 65 | env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR',
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('$RAD_BINDIR', rpict)])
71  
# Line 74 | Line 75 | if env.has_key('X11LIB'): # lots of special requiremen
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'] + ['$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')

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines