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.14 by greg, Wed Dec 15 01:40:11 2010 UTC vs.
Revision 1.18 by schorsch, Thu Mar 10 01:49:56 2016 UTC

# Line 7 | Line 7 | def radlib(name): return os.path.join(env['RAD_BUILDLI
7  
8   # custom flags
9   getlibpath = env.StaticObject(source='getlibpath.c',
10 <        CPPFLAGS='-DDEFPATH=\\":%s\\"' % env['RAD_RLIBDIR'])
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',
# Line 18 | Line 18 | RTSCENE = Split('''cone.c face.c free_os.c instance.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')+ RTCOLOR + RTTMAP
24 > RTPIC = Split('color.c colrops.c resolu.c image.c bmpfile.c falsecolor.c'
25 >                )+ RTCOLOR + RTTMAP
26  
27   RTERROR = Split('''error.c eputs.c wputs.c quit.c''')
28 < RTCONT = Split('''lookup.c savestr.c savqstr.c bsdf.c ezxml''')
28 > 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''')
29   RTMATH = Split('''fvect.c invmat4.c linregr.c mat4.c tcos.c urand.c urind.c
30                  zeroes.c dircode.c clip.c multisamp.c plocate.c byteswap.c'''
31                  ) + env.get('RAD_MATHCOMPAT', [])
32   RTFUNC = Split('''biggerlib.c caldefn.c calexpr.c calfunc.c calprnt.c
33                  chanvalue.c''')
34   RTIO = Split('''fdate.c fgetline.c fgetval.c fgetword.c fputword.c loadvars.c
35 <                portio.c wordfile.c words.c header.c timegm.c''')
35 >                portio.c wordfile.c words.c header.c timegm.c cvtcmd.c''')
36   RTARGS = Split('''badarg.c expandarg.c''') + env.get('RAD_ARGSCOMPAT', [])
37   RTPATH = Split('''getpath.c gethomedir.c paths.c''') + [getlibpath]
38 < RTLAMPS = Split('''fropen.c rexpr.c lamps.c''') + [getlibpath]
38 > 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  
42   RTPROC = Split('''process.c''') + env.get('RAD_PROCESS', [])
43  
# Line 47 | Line 51 | STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RT
51   ALL = RTSCENE + RTPIC + STD + RTNET
52  
53   # build libraries
50 rtall = env.StaticLibrary(target=radlib('rtall'), source=ALL)
51
54   rtscene = env.StaticLibrary(target=radlib('rtscene'), source=RTSCENE)
55 <
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)
# Line 62 | Line 64 | rtfunc = env.StaticLibrary(target=radlib('rtfunc'), so
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
# Line 70 | Line 73 | rtnet = env.StaticLibrary(target=radlib('rtnet'), sour
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)
79  
# Line 83 | Line 87 | if env.has_key('OGL'):
87                          CPPPATH=oglincl)
88          Default(librgl)
89  
90 + # vim: set syntax=python:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines