ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/SConscript
(Generate patch)

Comparing ray/src/common/SConscript (file contents):
Revision 1.4 by schorsch, Sat Jul 3 22:34:56 2004 UTC vs.
Revision 1.8 by schorsch, Fri Mar 10 19:40:12 2006 UTC

# Line 35 | Line 35 | RTLAMPS = Split('''fropen.c rexpr.c lamps.c''')
35  
36   RTPROC = Split('''process.c''') + env.get('RAD_PROCESS', [])
37  
38 < RTMEM = Split('ealloc.c') + env.get('RAD_MEMCOMPAT', [])
38 > RTMEM = Split('ealloc.c bmalloc.c')
39   RTNET = Split('myhostname.c')
40  
41   STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RTCONT + RTMEM +
# Line 60 | Line 60 | rtlamps = env.StaticLibrary(target=radlib('rtlamps'),
60   rtpic = env.StaticLibrary(target=radlib('rtpic'), source=RTPIC)
61   rtnet = env.StaticLibrary(target=radlib('rtnet'), source=RTNET)
62  
63 < #librt = env.StaticLibrary(target=radlib('rt'), source=ALL)
64 < #Default(librt)
63 > #librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
64 > #Default(librtrad)
65  
66   LIBFILES = Split('tmesh.cal')
67   env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))
68  
69   if env.has_key('OGL'):
70 <    RGL = Split('rglfile.c rglmat.c rgldomat.c rglsurf.c rglinst.c rglsrc.c')
71 <    librgl = env.StaticLibrary(target=radlib('rgl'), source=RGL)
72 <    Default(librgl)
70 >        oglincl = env.get('CPPPATH', []) + env.get('OGLINCLUDE', [])
71 >        RGL = Split('rglfile.c rglmat.c rgldomat.c rglsurf.c rglinst.c rglsrc.c')
72 >        librgl = env.StaticLibrary(target=radlib('rgl'), source=RGL,
73 >                        CPPPATH=oglincl)
74 >        Default(librgl)
75  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)