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.15 by greg, Fri Apr 15 21:52:16 2011 UTC

# 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')+ RTCOLOR + RTTMAP
25  
26   RTERROR = Split('''error.c eputs.c wputs.c quit.c''')
27 < RTCONT = Split('''lookup.c savestr.c savqstr.c bsdf.c ezxml''')
27 > 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 ezxml''')
28 > #RTCONT = Split('''lookup.c savestr.c savqstr.c bsdf.c ezxml getpath.c gethomedir.c paths.c words.c fvect.c multisamp.c mat4.c''') + [getlibpath]
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', [])
# Line 33 | Line 35 | RTIO = Split('''fdate.c fgetline.c fgetval.c fgetword.
35                  portio.c wordfile.c words.c header.c timegm.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  
40   RTPROC = Split('''process.c''') + env.get('RAD_PROCESS', [])
41  
# Line 47 | Line 49 | STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RT
49   ALL = RTSCENE + RTPIC + STD + RTNET
50  
51   # build libraries
50 – rtall = env.StaticLibrary(target=radlib('rtall'), source=ALL)
51 –
52   rtscene = env.StaticLibrary(target=radlib('rtscene'), source=RTSCENE)
53 <
53 > libmgf = env.StaticLibrary(target=radlib('mgf'), source=RTMGFOBJ)
54   rterror = env.StaticLibrary(target=radlib('rterror'), source=RTERROR)
55   rtpath = env.StaticLibrary(target=radlib('rtpath'), source=RTPATH)
56   rtargs = env.StaticLibrary(target=radlib('rtargs'), source=RTARGS)
# Line 70 | Line 70 | rtnet = env.StaticLibrary(target=radlib('rtnet'), sour
70   #   dynamically during program initialization.
71   rtdummy = env.StaticLibrary(target=radlib('rtdummy'), source=RTDUMMY)
72  
73 + rtall = env.StaticLibrary(target=radlib('rtall'), source=ALL)
74   #librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
75   #Default(librtrad)
76  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines