--- ray/src/util/SConscript	2005/09/19 12:59:49	1.13
+++ ray/src/util/SConscript	2016/03/10 21:43:23	1.21
@@ -8,43 +8,47 @@ progs = []
 # compose paths
 def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
 def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
+def tclscr(name): return os.path.join('$RAD_BUILDRLIB', 'tcl', name)
 
-Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
+cmatrix = env.Object(source='cmatrix.c')
+cmbsdf = env.Object(source='cmbsdf.c')
 
 # standard targets
 PROGS = [
-('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c'),
-	['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
-('glarendx',  Split('glarendx.c'), ['rtpic','rtio','rtargs','rtmath']),
-('vwright',   Split('vwright.c'),  ['rtpic','rtio','rtargs','rtmath']),
-('vwrays',    Split('vwrays.c'),   ['rtpic','rtio','rtargs','rtmath']),
-('rad',       Split('rad.c'),
-	['rtpic','rtproc','rtpath','rtio','rtmath','rtargs','rtcont','rtmem','rterror']),
-('rpiece',    Split('rpiece.c') + [Version],
-	['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
-('ranimate',  ['ranimate.c', '$RAD_NETCOMPAT'],
-	['rtpic','rtargs','rtio','rtproc','rtcont','rtmem','rtpath','rtmath',
-	'rtnet','rterror','$RAD_SOCKETLIB']),
-('rtcontrib', ['rtcontrib.c', Version],
-	['rtpic','rtargs','rtfunc','rtio','rtproc','rtcont','rtmem','rtpath',
-	'rtmath','rtnet','rterror','$RAD_SOCKETLIB'])
+('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c'), ['rtrad']),
+('glarendx',  Split('glarendx.c'), ['rtrad']),
+('vwright',   Split('vwright.c'),  ['rtrad']),
+('vwrays',    Split('vwrays.c'),   ['rtrad']),
+('rad',       Split('rad.c'),      ['rtrad']),
+('rpiece',    Split('rpiece.c') + [env.version], ['rtrad']),
+('ranimate',  ['ranimate.c', '$RAD_NETCOMPAT'], ['rtrad', '$RAD_SOCKETLIB']),
+('dctimestep', Split('dctimestep.c')+[cmatrix, cmbsdf], ['rtrad']),
+('rttree_reduce', Split('rttree_reduce.c'), ['rtrad']),
+('rcollate', Split('rcollate.c'), ['rtrad']),
+('eplus_adduvf', Split('eplus_adduvf.c eplus_idf.c'), ['rtrad']),
+('rfluxmtx', Split('rfluxmtx.c'), ['rtrad']),
+('rmtxop', Split('rmtxop.c rmatrix.c')+[cmatrix, cmbsdf], ['rtrad']),
+('wrapBSDF', Split('wrapBSDF.c'), ['rtrad']),
+('evalglare', Split('evalglare.c pictool.c'), ['rtrad', 'reetz']),
 ]
 
 for p in PROGS:
 	prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
 	progs.append(prog)
 
-if os.name != 'nt': # XXX pending Windows version of raypcalls.c
-	# targets with different includes/libs
-	rs = Split('ranimove.c ranimove1.c ranimove2.c')
-	ranimove = env.Program(target=radbin('ranimove'), source=rs,
-			CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
-			LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtio',
-			'rtmath','rtcont','rtmem','rtargs','rtproc','rtpath','rterror'] + mlib)
-	progs.append(ranimove)
+# targets with different includes/libs
+rs = Split('ranimove.c ranimove1.c ranimove2.c')
+ranimove = env.Program(target=radbin('ranimove'), source=rs,
+		CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
+		LIBS=['raycalls','rttrace','rtrad'] + mlib)
+progs.append(ranimove)
+rsensor = env.Program(target=radbin('rsensor'), source='rsensor.c',
+		CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
+		LIBS=['raycalls','rttrace','rtrad'] + mlib)
+progs.append(rsensor)
 
 getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
-		LIBS=['rtio'])
+		LIBS=['rtrad'])
 progs.append(getinfo)
 
 
@@ -52,12 +56,10 @@ progs.append(getinfo)
 if env.has_key('X11LIB'):
 	xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
 	xlibp = env.get('LIBPATH', []) + ['$X11LIB']
-	x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
-			CPPPATH=xincl)
 	xglaresrc = env.Program(target=radbin('xglaresrc'),
-			source=Split('xglaresrc.c') + [x11findwind],
+			source=Split('xglaresrc.c') + [env.x11findwind], # XXX remote magic
 			LIBPATH=xlibp, CPPPATH=xincl,
-			LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
+			LIBS=['rtrad', 'X11']+ mlib)
 	progs.append(xglaresrc)
 
 	# OpenGL targets that also depend on X11
@@ -65,15 +67,22 @@ if env.has_key('X11LIB'):
 		glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
 			CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
 			LIBPATH=xlibp, CPPPATH=xincl,
-			LIBS=['rgl','rtpic','rtscene','rtio','rtproc','rtpath','rtargs',
-			'rtmath','rtcont','rtmem','rterror',
-			'GL', 'GLU','X11'],)
+			LIBS=['rgl','rtrad','rtdummy', 'GL', 'GLU','X11'] + mlib,)
 		progs.append(glrad)
 
 if os.name == 'posix': # XXX ignoring trad.wsh
-	for s in Split('''objview objline objpict glare dayfact
-			debugcal rlux raddepend compamb vinfo genambpos fieldcomb'''):
-		Default(env.InstallCsh(radbin(s), s + '.csh'))
+	for s in Split('''objline glare dayfact
+			debugcal rlux raddepend compamb vinfo fieldcomb'''):
+		Default(env.InstallScript(radbin(s), s + '.csh'))
+	for s in Split('''objview objpict
+			genambpos genklemsamp genskyvec genBSDF ltview ltpict'''):
+		Default(env.InstallScript(radbin(s), s + '.pl'))
+	for s in Split('''do_action.tcl do_file.tcl do_options.tcl do_results.tcl
+		do_scene.tcl do_views.tcl do_zone.tcl file.hlp getfile.tcl gethelp.tcl
+		help.hlp tclIndex trad.hlp trad.icon util.tcl'''):
+		Default(env.InstallScript(tclscr(s), s))
+	Default(env.InstallTCLScript(radbin('trad'), 'trad.wsh'))
+	
 # Those don't really work yet
 #else:
 #	for s in Split('''objview glare rlux '''):
@@ -83,3 +92,4 @@ if os.name == 'posix': # XXX ignoring trad.wsh
 Default('#src/util')
 env.Install('$RAD_BINDIR', progs)
 
+# vim: set syntax=python: