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.5 by schorsch, Sun Jul 4 12:08:48 2004 UTC vs.
Revision 1.6 by schorsch, Thu Oct 21 15:47:13 2004 UTC

# Line 36 | Line 36 | SUP = Split('func.c noise3.c data.c')
36   rsrc = RAY + SURF + MAT + MOD + SUP
37   env.Command('Version.c', 'VERSION', vstamp.build_version_c)
38   env.Depends('Version.c', rsrc)
39 < Version = env.Object(source='Version.c')
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
# Line 51 | Line 51 | lasrc = ['lookamb.c', ambio]
51   lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
52          LIBS=['rtio', 'rtpic'])
53   Default(lookamb)
54 < env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], lookamb)])
54 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', lookamb)])
55  
56   rtmain = env.Object(source=['rtmain.c'],
57                  CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
58   rtsrc = ['rtrace.c', duphead, persist, rtmain]
59   rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
60 <        LIBS=fullib + ['rtproc'] + mlib) # rtproc for win_nice()
60 >        LIBS=fullib + mlib
61 >        )
62   Default(rtrace)
63 < env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rtrace)])
63 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rtrace)])
64  
65   rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
66   rpict = env.Program(target=radbin('rpict'), source=rpsrc,
67          LIBS=fullib+['rtnet']+mlib)
68   Default(rpict)
69 < env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rpict)])
69 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
70  
71   if env.has_key('X11LIB'): # lots of special requirements for rvu
72          x11incls = [env['X11INCLUDE']] + env['CPPPATH']
# Line 74 | Line 75 | if env.has_key('X11LIB'): # lots of special requiremen
75          rvmain = env.Object(source='rvmain.c',
76                  CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
77          rv3 = env.Object(source='rv3.c', # XXX we should get rid of SPEED
78 <                CCFLAGS=env['CCFLAGS'] + [env.get('RAD_SPEED', '')])
78 >                CCFLAGS=env['CCFLAGS'] + ['$RAD_SPEED']
79 >                )
80  
81          devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
82          rvobjs = [x11, x11twind, rv3, rvmain, rlib]
# Line 83 | Line 85 | if env.has_key('X11LIB'): # lots of special requiremen
85                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
86                  LIBS=fullib + ['X11'] + mlib)
87          Default(rvu)
88 <        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rvu)])
88 >        env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])
89  
90   LIBFILES = Split('rayinit.cal')
91 < env.Append(RAD_RLIBINSTALL=[env.Install(env['RAD_RLIBDIR'], LIBFILES)])
91 > env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
92  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines