--- ray/src/common/SConscript	2005/02/02 00:16:02	1.6
+++ ray/src/common/SConscript	2008/12/23 15:03:59	1.10
@@ -13,8 +13,8 @@ tmapcolrs = env.StaticObject(source='tmapcolrs.c',
 
 # 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]
@@ -23,7 +23,7 @@ RTPIC = Split('color.c colrops.c resolu.c image.c bmpf
 RTERROR = Split('''error.c eputs.c wputs.c quit.c''')
 RTCONT = Split('''lookup.c savestr.c savqstr.c''')
 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''')
@@ -35,8 +35,9 @@ RTLAMPS = Split('''fropen.c rexpr.c lamps.c''')
 
 RTPROC = Split('''process.c''') + env.get('RAD_PROCESS', [])
 
-RTMEM = Split('ealloc.c bmalloc.c') + env.get('RAD_MEMCOMPAT', [])
+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,9 +60,14 @@ 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)
 
-#librt = env.StaticLibrary(target=radlib('rt'), source=ALL)
-#Default(librt)
+#librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
+#Default(librtrad)
 
 LIBFILES = Split('tmesh.cal')
 env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))