--- ray/src/common/SConscript	2008/12/23 15:03:59	1.10
+++ ray/src/common/SConscript	2010/12/15 01:40:11	1.14
@@ -10,6 +10,8 @@ getlibpath = env.StaticObject(source='getlibpath.c',
         CPPFLAGS='-DDEFPATH=\\":%s\\"' % env['RAD_RLIBDIR'])
 tmapcolrs = env.StaticObject(source='tmapcolrs.c',
         CPPFLAGS='-DPCOND=\\"pcond\\"')
+ezxml = env.Object('ezxml.c',
+		CPPDEFINES=env.get('CPPDEFINES',[]) + env.get('EZXML_CPPDEFINES',[]))
 
 # source and object dependencies
 RTSCENE = Split('''cone.c face.c free_os.c instance.c readobj.c readoct.c
@@ -21,17 +23,17 @@ RTTMAP = Split('''tonemap.c tmapluv.c tmaptiff.c tmap1
 RTPIC = Split('color.c colrops.c resolu.c image.c bmpfile.c')+ RTCOLOR + RTTMAP
 
 RTERROR = Split('''error.c eputs.c wputs.c quit.c''')
-RTCONT = Split('''lookup.c savestr.c savqstr.c''')
+RTCONT = Split('''lookup.c savestr.c savqstr.c bsdf.c ezxml''')
 RTMATH = Split('''fvect.c invmat4.c linregr.c mat4.c tcos.c urand.c urind.c
 		zeroes.c dircode.c clip.c multisamp.c plocate.c byteswap.c'''
 		) + env.get('RAD_MATHCOMPAT', [])
 RTFUNC = Split('''biggerlib.c caldefn.c calexpr.c calfunc.c calprnt.c
 		chanvalue.c''')
 RTIO = Split('''fdate.c fgetline.c fgetval.c fgetword.c fputword.c loadvars.c
-		portio.c wordfile.c words.c header.c''')
+		portio.c wordfile.c words.c header.c timegm.c''')
 RTARGS = Split('''badarg.c expandarg.c''') + env.get('RAD_ARGSCOMPAT', [])
 RTPATH = Split('''getpath.c gethomedir.c paths.c''') + [getlibpath]
-RTLAMPS = Split('''fropen.c rexpr.c lamps.c''')
+RTLAMPS = Split('''fropen.c rexpr.c lamps.c''') + [getlibpath]
 
 RTPROC = Split('''process.c''') + env.get('RAD_PROCESS', [])
 
@@ -42,9 +44,11 @@ RTDUMMY = Split('addobjnotify.c')
 STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RTCONT + RTMEM +
 		RTFUNC + RTPROC + RTLAMPS)
 
-ALL = RTSCENE + RTPIC + STD + RTNET + env.get('RAD_COMPAT',[])
+ALL = RTSCENE + RTPIC + STD + RTNET
 
 # build libraries
+rtall = env.StaticLibrary(target=radlib('rtall'), source=ALL)
+
 rtscene = env.StaticLibrary(target=radlib('rtscene'), source=RTSCENE)
 
 rterror = env.StaticLibrary(target=radlib('rterror'), source=RTERROR)