--- ray/src/cv/SConscript	2003/10/21 19:27:28	1.1
+++ ray/src/cv/SConscript	2006/06/06 22:30:07	1.7
@@ -6,46 +6,54 @@ 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)
+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(radlib('mgf'), source=mgfsf(MGFSRC))
+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')),
 )
 for p in MGFPROGS:
-	prog = env.Program(target=radbin(p[0]), source=mgfsf(p[1]) + [libmgf],
-			LIBS=mlib)
+	prog = env.Program(target=rbin(p[0]), source=mgfs(p[1]), LIBS=mlib+['mgf'])
 	Default(prog)
 	env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
 
+trans = env.Object(source="trans.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),
+('ies2rad',   ['ies2rad.c'],       ['rtlamps','rtcolor','rtio','rtpath']+ 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),
+('rad2mgf',   ['rad2mgf.c'],
+	['rtproc', 'rtpath', # for win_popen()
+    'rtscene','rtio','rtcolor','rtcont','rtmem','rterror'] + mlib),
 ]
-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])
+	prog = env.Program(target=rbin(p[0]), source=p[1], LIBS=p[2])
 	Default(prog)
 	env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
 
-LIBFILES = Split('source.cal tilt.cal')# lamp.tab')
+# 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)
+
+LIBFILES = Split('source.cal tilt.cal lamp.tab window.cal')
 env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))
 
-
+if os.name == 'posix':
+	for s in Split('''optics2rad'''):
+		Default(env.InstallCsh(radbin(s), s + '.csh'))