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.8 by schorsch, Fri Mar 10 19:40:12 2006 UTC vs.
Revision 1.12 by schorsch, Thu Oct 22 20:39:14 2009 UTC

# Line 10 | Line 10 | getlibpath = env.StaticObject(source='getlibpath.c',
10          CPPFLAGS='-DDEFPATH=\\":%s\\"' % env['RAD_RLIBDIR'])
11   tmapcolrs = env.StaticObject(source='tmapcolrs.c',
12          CPPFLAGS='-DPCOND=\\"pcond\\"')
13 + ezxml = env.Object('ezxml.c',
14 +                CPPDEFINES=env.get('CPPDEFINES',[]) + env.get('EZXML_CPPDEFINES',[]))
15  
16   # source and object dependencies
17   RTSCENE = Split('''cone.c face.c free_os.c instance.c readobj.c readoct.c
18 <                otypes.c objset.c octree.c readfargs.c modobject.c addobjnotify.c
19 <                font.c mesh.c readmesh.c tmesh.c sceneio.c xf.c''')
18 >                otypes.c objset.c octree.c readfargs.c modobject.c
19 >                font.c mesh.c readmesh.c tmesh.c sceneio.c xf.c''') #addobjnotify.c
20  
21   RTCOLOR = Split('''spec_rgb.c''')
22   RTTMAP = Split('''tonemap.c tmapluv.c tmaptiff.c tmap16bit.c''') + [tmapcolrs]
23   RTPIC = Split('color.c colrops.c resolu.c image.c bmpfile.c')+ RTCOLOR + RTTMAP
24  
25   RTERROR = Split('''error.c eputs.c wputs.c quit.c''')
26 < RTCONT = Split('''lookup.c savestr.c savqstr.c''')
26 > RTCONT = Split('''lookup.c savestr.c savqstr.c bsdf.c ezxml''')
27   RTMATH = Split('''fvect.c invmat4.c linregr.c mat4.c tcos.c urand.c urind.c
28 <                zeroes.c dircode.c clip.c multisamp.c plocate.c'''
28 >                zeroes.c dircode.c clip.c multisamp.c plocate.c byteswap.c'''
29                  ) + env.get('RAD_MATHCOMPAT', [])
30   RTFUNC = Split('''biggerlib.c caldefn.c calexpr.c calfunc.c calprnt.c
31                  chanvalue.c''')
# Line 37 | Line 39 | RTPROC = Split('''process.c''') + env.get('RAD_PROCESS
39  
40   RTMEM = Split('ealloc.c bmalloc.c')
41   RTNET = Split('myhostname.c')
42 + RTDUMMY = Split('addobjnotify.c')
43  
44   STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RTCONT + RTMEM +
45                  RTFUNC + RTPROC + RTLAMPS)
# Line 59 | Line 62 | rtcolor = env.StaticLibrary(target=radlib('rtcolor'),
62   rtlamps = env.StaticLibrary(target=radlib('rtlamps'), source=RTLAMPS)
63   rtpic = env.StaticLibrary(target=radlib('rtpic'), source=RTPIC)
64   rtnet = env.StaticLibrary(target=radlib('rtnet'), source=RTNET)
65 + # librtdummy is needed, because addobjnotify has different sizes depending
66 + #   on the program, and in some cases isn't actually needed at all.
67 + #   It should really be a pointer, and its content allocated
68 + #   dynamically during program initialization.
69 + rtdummy = env.StaticLibrary(target=radlib('rtdummy'), source=RTDUMMY)
70  
71   #librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
72   #Default(librtrad)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines