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.19 by schorsch, Thu Mar 10 21:43:22 2016 UTC

# Line 17 | Line 17 | ezxml = env.Object('ezxml.c',
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
19                  font.c mesh.c readmesh.c tmesh.c sceneio.c xf.c''') #addobjnotify.c
20 <
21 < 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 <
20 > RTPIC = Split('''color.c colrops.c resolu.c image.c bmpfile.c falsecolor.c
21 >                tonemap.c tmapluv.c tmaptiff.c tmap16bit.c''') + [tmapcolrs]
22   RTERROR = Split('''error.c eputs.c wputs.c quit.c''')
23 < 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''')
23 > RTCONT = Split('''ezxml lookup.c savestr.c savqstr.c ccolor.c ccyrgb.c
24 >                spec_rgb.c bsdf.c bsdf_m.c bsdf_t.c loadbsdf.c
25 >                disk2square.c hilbert.c interp2d.c triangulate.c''')
26   RTMATH = Split('''fvect.c invmat4.c linregr.c mat4.c tcos.c urand.c urind.c
27                  zeroes.c dircode.c clip.c multisamp.c plocate.c byteswap.c'''
28                  ) + env.get('RAD_MATHCOMPAT', [])
# Line 35 | Line 32 | RTIO = Split('''fdate.c fgetline.c fgetval.c fgetword.
32                  portio.c wordfile.c words.c header.c timegm.c cvtcmd.c''')
33   RTARGS = Split('''badarg.c expandarg.c''') + env.get('RAD_ARGSCOMPAT', [])
34   RTPATH = Split('''getpath.c gethomedir.c paths.c''') + [getlibpath]
35 < 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 <
35 > RTLAMPS = Split('''fropen.c rexpr.c lamps.c''')
36   RTPROC = Split('''process.c''') + env.get('RAD_PROCESS', [])
43
37   RTMEM = Split('ealloc.c bmalloc.c')
38   RTNET = Split('myhostname.c')
39 < RTDUMMY = Split('addobjnotify.c')
39 > librtrad = env.StaticLibrary(target=radlib('rtrad'),
40 >                source=(RTERROR + RTPATH + RTARGS + RTIO + RTMATH + RTCONT + RTMEM
41 >                        + RTFUNC + RTPROC + RTLAMPS + RTSCENE + RTPIC + RTNET))
42  
43 < STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RTCONT + RTMEM +
44 <                RTFUNC + RTPROC + RTLAMPS)
43 > MGF = Split('''mgf_parser.c mgf_object.c mgf_xf.c mgf_context.c''')
44 > libmgf = env.StaticLibrary(target=radlib('mgf'), source=MGF)
45  
46 < ALL = RTSCENE + RTPIC + STD + RTNET
46 > REETZ = Split('g3affine.c g3flist.c g3sphere.c g3vector.c gbasic.c maxheap.c')
47 > libreetz = env.StaticLibrary(target=radlib('reetz'), source=REETZ)
48  
53 # build libraries
54 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)
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)
75
76 rtall = env.StaticLibrary(target=radlib('rtall'), source=ALL)
77 #librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
78 #Default(librtrad)
55  
56   LIBFILES = Split('tmesh.cal')
57   env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines