--- ray/src/cv/SConscript	2006/06/07 17:52:03	1.8
+++ ray/src/cv/SConscript	2016/03/05 13:24:58	1.13
@@ -7,39 +7,42 @@ mlib = env['RAD_MLIB']
 
 # compose paths
 def rbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
-def rlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
-def mgfs(src): return map(lambda s:os.path.join('mgflib', s), src)
 
-MGFSRC = Split('''parser.c context.c xf.c object.c lookup.c badarg.c
-		words.c
-		fvect.c''')
-libmgf = env.StaticLibrary(rlib('mgf'), source=mgfs(MGFSRC))
-
 MGFPROGS = (
-('mgfilt',  Split('mgfilt.c')),
-('mgf2inv', Split('mgf2inv.c cvrgb.c')),
-('3ds2mgf', Split('3ds2mgf.c rayopt.c vect.c')),
+('3ds2mgf', Split('3ds2mgf.c rayopt3ds.c vect3ds.c')),
 )
 for p in MGFPROGS:
-	prog = env.Program(target=rbin(p[0]), source=mgfs(p[1]), LIBS=mlib+['mgf'])
+	prog = env.Program(target=rbin(p[0]), source=p[1], LIBS=mlib+['mgf','rtcont'])
 	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 = [
 ('ies2rad',   ['ies2rad.c'],       ['rtlamps','rtcolor','rtio','rtpath']+ mlib),
-('arch2rad',  ['arch2rad.c',trans],['rtcont','rtmem'] + mlib),
+#('arch2rad',  ['arch2rad.c',trans],['rtcont','rtmem'] + mlib),
 ('nff2rad',   ['nff2rad.c'],       []),
 ('lampcolor', ['lampcolor.c'],     ['rtlamps','rtcolor','rtio','rtpath']),
 ('tmesh2rad', ['tmesh2rad.c'],     ['rtscene','rtmath'] + mlib),
 ('obj2rad',   ['obj2rad.c',trans], 
     ['rtscene','rtargs','rtio','rtcont','rtmem','rtmath','rterror'] + mlib),
-('mgf2rad',   ['mgf2rad.c'],       ['rtscene','rtcolor','mgf'] + mlib),
+('mgf2rad',   ['mgf2rad.c'],       ['mgf','rtall'] + mlib),
 ('rad2mgf',   ['rad2mgf.c'],
 	['rtproc', 'rtpath', # for win_popen()
     'rtscene','rtio','rtcolor','rtcont','rtmem','rterror'] + mlib),
+('mgfilt',    ['mgfilt.c'],        ['mgf','rtall'] + mlib),
+('mgf2inv',   ['mgf2inv.c'],       ['mgf','rtall'] + mlib),
+('pabopto2bsdf', 
+	['pabopto2bsdf.c',bsdfrep,'bsdfrbf.c', 'bsdfmesh.c', 'bsdftrans.cpp',], 
+	['rtall'] + mlib),
+('bsdf2klems',['bsdf2klems.c',bsdfrep,bsdfinterp, ], ['rtall'] + mlib),
+('bsdf2ttree',['bsdf2ttree.c',bsdfrep,bsdfinterp, ], ['rtall'] + mlib),
+('pkgBSDF',   ['pkgBSDF.c', ], ['rtall'] + mlib),
+('epw2wea',   ['epw2wea.c', ], ['rtall'] + mlib),
 ]
 for p in PROGS:
 	prog = env.Program(target=rbin(p[0]), source=p[1], LIBS=p[2])
@@ -49,11 +52,14 @@ for p in PROGS:
 # meta targets
 prog = env.Program(target=rbin('mgf2meta'), source=['mgf2meta.c'],
 		CPPPATH=env.get('CPPPATH', []) + [os.path.join('#src','meta')],
-		LIBS=['meta','rtmath','rtcont','rtmem','rterror','mgf'] + mlib)
+		LIBS=['meta','mgf','rtall'] + mlib)
+env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
 
-LIBFILES = Split('source.cal tilt.cal lamp.tab window.cal')
+LIBFILES = Split('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.InstallCsh(rbin(s), s + '.csh'))
+		Default(env.InstallScript(rbin(s), s + '.csh'))
+
+# vim: set syntax=python: