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.9 by schorsch, Mon Apr 21 07:31:28 2008 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 37 | Line 37 | RTPROC = Split('''process.c''') + env.get('RAD_PROCESS
37  
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   #librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
70   #Default(librtrad)

Diff Legend

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