ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/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.10 by schorsch, Tue Dec 23 15:03:59 2008 UTC

# Line 13 | Line 13 | tmapcolrs = env.StaticObject(source='tmapcolrs.c',
13  
14   # source and object dependencies
15   RTSCENE = Split('''cone.c face.c free_os.c instance.c readobj.c readoct.c
16 <                otypes.c objset.c octree.c readfargs.c modobject.c addobjnotify.c
17 <                font.c mesh.c readmesh.c tmesh.c sceneio.c xf.c''')
16 >                otypes.c objset.c octree.c readfargs.c modobject.c
17 >                font.c mesh.c readmesh.c tmesh.c sceneio.c xf.c''') #addobjnotify.c
18  
19   RTCOLOR = Split('''spec_rgb.c''')
20   RTTMAP = Split('''tonemap.c tmapluv.c tmaptiff.c tmap16bit.c''') + [tmapcolrs]
# Line 23 | Line 23 | RTPIC = Split('color.c colrops.c resolu.c image.c bmpf
23   RTERROR = Split('''error.c eputs.c wputs.c quit.c''')
24   RTCONT = Split('''lookup.c savestr.c savqstr.c''')
25   RTMATH = Split('''fvect.c invmat4.c linregr.c mat4.c tcos.c urand.c urind.c
26 <                zeroes.c dircode.c clip.c multisamp.c plocate.c'''
26 >                zeroes.c dircode.c clip.c multisamp.c plocate.c byteswap.c'''
27                  ) + env.get('RAD_MATHCOMPAT', [])
28   RTFUNC = Split('''biggerlib.c caldefn.c calexpr.c calfunc.c calprnt.c
29                  chanvalue.c''')
# 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 + RTDUMMY = Split('addobjnotify.c')
41  
42   STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RTCONT + RTMEM +
43                  RTFUNC + RTPROC + RTLAMPS)
# Line 59 | Line 60 | rtcolor = env.StaticLibrary(target=radlib('rtcolor'),
60   rtlamps = env.StaticLibrary(target=radlib('rtlamps'), source=RTLAMPS)
61   rtpic = env.StaticLibrary(target=radlib('rtpic'), source=RTPIC)
62   rtnet = env.StaticLibrary(target=radlib('rtnet'), source=RTNET)
63 + # librtdummy is needed, because addobjnotify has different sizes depending
64 + #   on the program, and in some cases isn't actually needed at all.
65 + #   It should really be a pointer, and its content allocated
66 + #   dynamically during program initialization.
67 + rtdummy = env.StaticLibrary(target=radlib('rtdummy'), source=RTDUMMY)
68  
69 < #librt = env.StaticLibrary(target=radlib('rt'), source=ALL)
70 < #Default(librt)
69 > #librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
70 > #Default(librtrad)
71  
72   LIBFILES = Split('tmesh.cal')
73   env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))
74  
75   if env.has_key('OGL'):
76 <    RGL = Split('rglfile.c rglmat.c rgldomat.c rglsurf.c rglinst.c rglsrc.c')
77 <    librgl = env.StaticLibrary(target=radlib('rgl'), source=RGL)
78 <    Default(librgl)
76 >        oglincl = env.get('CPPPATH', []) + env.get('OGLINCLUDE', [])
77 >        RGL = Split('rglfile.c rglmat.c rgldomat.c rglsurf.c rglinst.c rglsrc.c')
78 >        librgl = env.StaticLibrary(target=radlib('rgl'), source=RGL,
79 >                        CPPPATH=oglincl)
80 >        Default(librgl)
81  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines