--- ray/src/common/SConscript	2006/03/10 19:40:12	1.8
+++ ray/src/common/SConscript	2009/10/22 20:39:14	1.12
@@ -10,20 +10,22 @@ 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
-		otypes.c objset.c octree.c readfargs.c modobject.c addobjnotify.c
-		font.c mesh.c readmesh.c tmesh.c sceneio.c xf.c''')
+		otypes.c objset.c octree.c readfargs.c modobject.c
+		font.c mesh.c readmesh.c tmesh.c sceneio.c xf.c''') #addobjnotify.c
 
 RTCOLOR = Split('''spec_rgb.c''')
 RTTMAP = Split('''tonemap.c tmapluv.c tmaptiff.c tmap16bit.c''') + [tmapcolrs]
 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'''
+		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''')
@@ -37,6 +39,7 @@ RTPROC = Split('''process.c''') + env.get('RAD_PROCESS
 
 RTMEM = Split('ealloc.c bmalloc.c')
 RTNET = Split('myhostname.c')
+RTDUMMY = Split('addobjnotify.c')
 
 STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RTCONT + RTMEM +
 		RTFUNC + RTPROC + RTLAMPS)
@@ -59,6 +62,11 @@ rtcolor = env.StaticLibrary(target=radlib('rtcolor'), 
 rtlamps = env.StaticLibrary(target=radlib('rtlamps'), source=RTLAMPS)
 rtpic = env.StaticLibrary(target=radlib('rtpic'), source=RTPIC)
 rtnet = env.StaticLibrary(target=radlib('rtnet'), source=RTNET)
+# librtdummy is needed, because addobjnotify has different sizes depending
+#   on the program, and in some cases isn't actually needed at all.
+#   It should really be a pointer, and its content allocated
+#   dynamically during program initialization.
+rtdummy = env.StaticLibrary(target=radlib('rtdummy'), source=RTDUMMY)
 
 #librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
 #Default(librtrad)