--- ray/src/common/SConscript	2008/04/21 07:31:28	1.9
+++ ray/src/common/SConscript	2016/03/10 01:49:56	1.18
@@ -7,45 +7,52 @@ def radlib(name): return os.path.join(env['RAD_BUILDLI
 
 # custom flags
 getlibpath = env.StaticObject(source='getlibpath.c',
-        CPPFLAGS='-DDEFPATH=\\":%s\\"' % env['RAD_RLIBDIR'])
+        CPPFLAGS='-DDEFPATH="\\"%s\\""' % env['RAD_RLIBDIR'].replace('\\','/'))
 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
 
+RTMGFOBJ = Split('''mgf_parser.c mgf_object.c mgf_xf.c mgf_context.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
+RTPIC = Split('color.c colrops.c resolu.c image.c bmpfile.c falsecolor.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 ccolor.c ccyrgb.c bsdf_m.c bsdf_t.c disk2square.c hilbert.c loadbsdf.c interp2d.c triangulate.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 cvtcmd.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]
+REETZ = Split('''g3affine.c g3flist.c g3sphere.c g3vector.c gbasic.c
+		maxheap.c''')
 
 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)
 
-ALL = RTSCENE + RTPIC + STD + RTNET + env.get('RAD_COMPAT',[])
+ALL = RTSCENE + RTPIC + STD + RTNET
 
 # build libraries
 rtscene = env.StaticLibrary(target=radlib('rtscene'), source=RTSCENE)
-
+libmgf = env.StaticLibrary(target=radlib('mgf'), source=RTMGFOBJ)
 rterror = env.StaticLibrary(target=radlib('rterror'), source=RTERROR)
 rtpath = env.StaticLibrary(target=radlib('rtpath'), source=RTPATH)
 rtargs = env.StaticLibrary(target=radlib('rtargs'), source=RTARGS)
@@ -57,9 +64,16 @@ rtfunc = env.StaticLibrary(target=radlib('rtfunc'), so
 rtproc = env.StaticLibrary(target=radlib('rtproc'), source=RTPROC)
 rtcolor = env.StaticLibrary(target=radlib('rtcolor'), source=RTCOLOR)
 rtlamps = env.StaticLibrary(target=radlib('rtlamps'), source=RTLAMPS)
+reetz = env.StaticLibrary(target=radlib('reetz'), source=REETZ)
 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)
 
+rtall = env.StaticLibrary(target=radlib('rtall'), source=ALL)
 #librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
 #Default(librtrad)
 
@@ -73,3 +87,4 @@ if env.has_key('OGL'):
 			CPPPATH=oglincl)
 	Default(librgl)
 
+# vim: set syntax=python: