--- ray/src/cv/SConscript	2003/10/21 19:27:28	1.1
+++ ray/src/cv/SConscript	2018/01/08 13:38:37	1.16
@@ -1,3 +1,5 @@
+from __future__ import division, print_function, unicode_literals
+
 import os
 
 Import ('env')
@@ -6,46 +8,48 @@ Import ('env')
 mlib = env['RAD_MLIB']
 
 # compose paths
-def radbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
-def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
-def mgfsf(src): return map(lambda s:os.path.join('mgflib', s), src)
+def rbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
 
-MGFSRC = Split('''parser.c context.c xf.c object.c lookup.c badarg.c
-		words.c
-		fvect.c''')
-libmgf = env.StaticLibrary(radlib('mgf'), source=mgfsf(MGFSRC))
-MGFPROGS = (
-('mgfilt',  Split('mgfilt.c')),
-('mgf2inv', Split('mgf2inv.c cvrgb.c')),
-('3ds2mgf', Split('3ds2mgf.c rayopt.c vect.c')),
-)
-for p in MGFPROGS:
-	prog = env.Program(target=radbin(p[0]), source=mgfsf(p[1]) + [libmgf],
-			LIBS=mlib)
-	Default(prog)
-	env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
+trans = env.Object(source="trans.c")
+bsdfrep = env.Object(source="bsdfrep.c")
+bsdfinterp = env.Object(source="bsdfinterp.c")
 
 # standard targets
 PROGS = [
-('thf2rad',   Split('thf2rad.c'),           []),
-('ies2rad',   Split('ies2rad.c'),           ['rt'] + mlib),
-('arch2rad',  Split('arch2rad.c trans.c'),  ['rt'] + mlib),
-('nff2rad',   Split('nff2rad.c'),           []),
-('lampcolor', Split('lampcolor.c'),         ['rt']),
-('tmesh2rad', Split('tmesh2rad.c'),         ['rt'] + mlib),
-('obj2rad',   Split('obj2rad.c trans.c'),   ['rt'] + mlib),
-#('mgf2rad',   Split('mgf2rad.c')+[libmgf],  ['rt'] + mlib),
-('rad2mgf',   Split('rad2mgf.c'),           ['rt'] + mlib),
-('mgf2meta',  Split('mgf2meta.c')+[libmgf], ['meta','rt'] + mlib),
+('3ds2mgf', Split('3ds2mgf.c rayopt3ds.c vect3ds.c'), ['mgf','rtrad'] + mlib),
+('ies2rad',   ['ies2rad.c'],       ['rtrad'] + mlib),
+#('arch2rad',  ['arch2rad.c',trans],['rtrad'] + mlib),
+('nff2rad',   ['nff2rad.c'],       []),
+('lampcolor', ['lampcolor.c'],     ['rtrad'] ),
+('tmesh2rad', ['tmesh2rad.c'],     ['rtrad']  + mlib),
+('obj2rad',   ['obj2rad.c',trans], ['rtrad']  + mlib),
+('mgf2rad',   ['mgf2rad.c'],       ['mgf','rtrad']  + mlib),
+('rad2mgf',   ['rad2mgf.c'],       ['rtrad'] + mlib),
+('mgfilt',    ['mgfilt.c'],        ['mgf','rtrad'] + mlib),
+('mgf2inv',   ['mgf2inv.c'],       ['mgf','rtrad'] + mlib),
+('pabopto2bsdf', 
+	['pabopto2bsdf.c',bsdfrep,'bsdfrbf.c', 'bsdfmesh.c', 'bsdftrans.cpp',], 
+	['rtrad'] + mlib),
+('bsdf2klems',['bsdf2klems.c', bsdfrep, bsdfinterp,], ['rtrad'] + mlib),
+('bsdf2ttree',['bsdf2ttree.c', bsdfrep, bsdfinterp,], ['rtrad'] + mlib),
+('pkgBSDF',   ['pkgBSDF.c', ], ['rtrad'] + mlib),
+('epw2wea',   ['epw2wea.c', ], ['rtrad'] + mlib),
+('mgf2meta',  ['mgf2meta.c'],  ['meta', 'mgf','rtrad'] + mlib,
+	[os.path.join('#src','meta')]),
 ]
-if not os.name == 'nt': # XXX until we sort out the library conflicts
-	PROGS.append(('mgf2rad',   Split('mgf2rad.c')+[libmgf],  ['rt'] + mlib))
 for p in PROGS:
-	prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2])
+	if len(p) == 4: inclp = env.get('CPPPATH', []) + [os.path.join('#src','meta')],
+	else: inclp = env.get('CPPPATH', [])
+	prog = env.Program(target=rbin(p[0]), source=p[1], LIBS=p[2], CPPPATH=inclp)
 	Default(prog)
 	env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
 
-LIBFILES = Split('source.cal tilt.cal')# lamp.tab')
+LIBFILES = Split('bsdf2rad.cal source.cal tilt.cal window.cal')
 env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))
 
+if os.name == 'posix':
+	for s in Split('''optics2rad'''):
+		Default(env.InstallScript(rbin(s), s + '.csh'))
 
+# vim: set syntax=python:
+# vi: set ts=4 sw=4 :