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.19 by schorsch, Thu Mar 10 21:43:22 2016 UTC vs.
Revision 1.20 by schorsch, Fri Mar 18 22:54:22 2016 UTC

# Line 10 | Line 10 | getlibpath = env.StaticObject(source='getlibpath.c',
10          CPPFLAGS='-DDEFPATH="\\"%s\\""' % env['RAD_RLIBDIR'].replace('\\','/'))
11   tmapcolrs = env.StaticObject(source='tmapcolrs.c',
12          CPPFLAGS='-DPCOND=\\"pcond\\"')
13 < ezxml = env.Object('ezxml.c',
13 > ezxml = env.StaticObject('ezxml.c',
14                  CPPDEFINES=env.get('CPPDEFINES',[]) + env.get('EZXML_CPPDEFINES',[]))
15 + objs = [getlibpath, tmapcolrs, ezxml]
16  
17 + # the definition of addobjnotify conflicts with definitions in other files
18 + # that are more essential to the library.
19 + # We need to pass this one around and include it individually
20 + addobjn = env.StaticObject(source='addobjnotify.c')
21 + env['ADDOBJNOTIFY'] = addobjn
22 +
23   # source and object dependencies
24   RTSCENE = Split('''cone.c face.c free_os.c instance.c readobj.c readoct.c
25                  otypes.c objset.c octree.c readfargs.c modobject.c
26 <                font.c mesh.c readmesh.c tmesh.c sceneio.c xf.c''') #addobjnotify.c
26 >                font.c mesh.c readmesh.c tmesh.c sceneio.c xf.c''')
27   RTPIC = Split('''color.c colrops.c resolu.c image.c bmpfile.c falsecolor.c
28 <                tonemap.c tmapluv.c tmaptiff.c tmap16bit.c''') + [tmapcolrs]
28 >                tonemap.c tmapluv.c tmap16bit.c tmaptiff.c''')
29   RTERROR = Split('''error.c eputs.c wputs.c quit.c''')
30 < RTCONT = Split('''ezxml lookup.c savestr.c savqstr.c ccolor.c ccyrgb.c
30 > RTCONT = Split('''lookup.c savestr.c savqstr.c ccolor.c ccyrgb.c
31                  spec_rgb.c bsdf.c bsdf_m.c bsdf_t.c loadbsdf.c
32                  disk2square.c hilbert.c interp2d.c triangulate.c''')
33   RTMATH = Split('''fvect.c invmat4.c linregr.c mat4.c tcos.c urand.c urind.c
# Line 31 | Line 38 | RTFUNC = Split('''biggerlib.c caldefn.c calexpr.c calf
38   RTIO = Split('''fdate.c fgetline.c fgetval.c fgetword.c fputword.c loadvars.c
39                  portio.c wordfile.c words.c header.c timegm.c cvtcmd.c''')
40   RTARGS = Split('''badarg.c expandarg.c''') + env.get('RAD_ARGSCOMPAT', [])
41 < RTPATH = Split('''getpath.c gethomedir.c paths.c''') + [getlibpath]
41 > RTPATH = Split('''getpath.c gethomedir.c paths.c''')
42   RTLAMPS = Split('''fropen.c rexpr.c lamps.c''')
43   RTPROC = Split('''process.c''') + env.get('RAD_PROCESS', [])
44   RTMEM = Split('ealloc.c bmalloc.c')
45   RTNET = Split('myhostname.c')
46 +
47   librtrad = env.StaticLibrary(target=radlib('rtrad'),
48 <                source=(RTERROR + RTPATH + RTARGS + RTIO + RTMATH + RTCONT + RTMEM
49 <                        + RTFUNC + RTPROC + RTLAMPS + RTSCENE + RTPIC + RTNET))
48 >                source=RTERROR + RTPATH + RTARGS + RTIO + RTMATH + RTCONT + RTMEM
49 >                        + RTFUNC + RTPROC + RTLAMPS + RTSCENE + RTPIC + RTNET + objs)
50  
51   MGF = Split('''mgf_parser.c mgf_object.c mgf_xf.c mgf_context.c''')
52   libmgf = env.StaticLibrary(target=radlib('mgf'), source=MGF)
53  
54   REETZ = Split('g3affine.c g3flist.c g3sphere.c g3vector.c gbasic.c maxheap.c')
55   libreetz = env.StaticLibrary(target=radlib('reetz'), source=REETZ)
48
49 # librtdummy is needed, because addobjnotify has different sizes depending
50 #   on the program, and in some cases isn't actually needed at all.
51 #   It should really be a pointer, and its content allocated
52 #   dynamically during program initialization.
53 RTDUMMY = Split('addobjnotify.c')
54 rtdummy = env.StaticLibrary(target=radlib('rtdummy'), source=RTDUMMY)
56  
57   LIBFILES = Split('tmesh.cal')
58   env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines