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.18 by schorsch, Thu Mar 10 01:49:56 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
27 <
28 < RTMGFOBJ = Split('''mgf_parser.c mgf_object.c mgf_xf.c mgf_context.c''')
22 < RTCOLOR = Split('''spec_rgb.c''')
23 < RTTMAP = Split('''tonemap.c tmapluv.c tmaptiff.c tmap16bit.c''') + [tmapcolrs]
24 < RTPIC = Split('color.c colrops.c resolu.c image.c bmpfile.c falsecolor.c'
25 <                )+ RTCOLOR + RTTMAP
26 <
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 tmap16bit.c tmaptiff.c''')
29   RTERROR = Split('''error.c eputs.c wputs.c quit.c''')
30 < RTCONT = Split('''lookup.c savestr.c savqstr.c bsdf.c ccolor.c ccyrgb.c bsdf_m.c bsdf_t.c disk2square.c hilbert.c loadbsdf.c interp2d.c triangulate.c ezxml''')
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
34                  zeroes.c dircode.c clip.c multisamp.c plocate.c byteswap.c'''
35                  ) + env.get('RAD_MATHCOMPAT', [])
# Line 34 | 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]
42 < RTLAMPS = Split('''fropen.c rexpr.c lamps.c''')+ [getlibpath]
39 < REETZ = Split('''g3affine.c g3flist.c g3sphere.c g3vector.c gbasic.c
40 <                maxheap.c''')
41 <
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', [])
43
44   RTMEM = Split('ealloc.c bmalloc.c')
45   RTNET = Split('myhostname.c')
46 RTDUMMY = Split('addobjnotify.c')
46  
47 < STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RTCONT + RTMEM +
48 <                RTFUNC + RTPROC + RTLAMPS)
47 > librtrad = env.StaticLibrary(target=radlib('rtrad'),
48 >                source=RTERROR + RTPATH + RTARGS + RTIO + RTMATH + RTCONT + RTMEM
49 >                        + RTFUNC + RTPROC + RTLAMPS + RTSCENE + RTPIC + RTNET + objs)
50  
51 < ALL = RTSCENE + RTPIC + STD + RTNET
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 < # build libraries
55 < rtscene = env.StaticLibrary(target=radlib('rtscene'), source=RTSCENE)
55 < libmgf = env.StaticLibrary(target=radlib('mgf'), source=RTMGFOBJ)
56 < rterror = env.StaticLibrary(target=radlib('rterror'), source=RTERROR)
57 < rtpath = env.StaticLibrary(target=radlib('rtpath'), source=RTPATH)
58 < rtargs = env.StaticLibrary(target=radlib('rtargs'), source=RTARGS)
59 < rtio = env.StaticLibrary(target=radlib('rtio'), source=RTIO)
60 < rtmath = env.StaticLibrary(target=radlib('rtmath'), source=RTMATH)
61 < rtcont = env.StaticLibrary(target=radlib('rtcont'), source=RTCONT)
62 < rtmem = env.StaticLibrary(target=radlib('rtmem'), source=RTMEM)
63 < rtfunc = env.StaticLibrary(target=radlib('rtfunc'), source=RTFUNC)
64 < rtproc = env.StaticLibrary(target=radlib('rtproc'), source=RTPROC)
65 < rtcolor = env.StaticLibrary(target=radlib('rtcolor'), source=RTCOLOR)
66 < rtlamps = env.StaticLibrary(target=radlib('rtlamps'), source=RTLAMPS)
67 < reetz = env.StaticLibrary(target=radlib('reetz'), source=REETZ)
68 < rtpic = env.StaticLibrary(target=radlib('rtpic'), source=RTPIC)
69 < rtnet = env.StaticLibrary(target=radlib('rtnet'), source=RTNET)
70 < # librtdummy is needed, because addobjnotify has different sizes depending
71 < #   on the program, and in some cases isn't actually needed at all.
72 < #   It should really be a pointer, and its content allocated
73 < #   dynamically during program initialization.
74 < rtdummy = env.StaticLibrary(target=radlib('rtdummy'), source=RTDUMMY)
75 <
76 < rtall = env.StaticLibrary(target=radlib('rtall'), source=ALL)
77 < #librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
78 < #Default(librtrad)
54 > REETZ = Split('g3affine.c g3flist.c g3sphere.c g3vector.c gbasic.c maxheap.c')
55 > libreetz = env.StaticLibrary(target=radlib('reetz'), source=REETZ)
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