--- ray/src/util/SConscript	2005/09/19 11:30:11	1.12
+++ ray/src/util/SConscript	2010/12/15 01:40:11	1.18
@@ -9,17 +9,17 @@ progs = []
 def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
 def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
 
-Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
+Version = env.Object(source='#src/rt/Version.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']),
+('glarendx',  Split('glarendx.c'), ['rtpic','rtargs','rtio','rtmath']),
+('vwright',   Split('vwright.c'),  ['rtpic','rtargs','rtio','rtmath']),
+('vwrays',    Split('vwrays.c'),   ['rtpic','rtargs','rtio','rtmath']),
 ('rad',       Split('rad.c'),
-	['rtpic','rtproc','rtpath','rtio','rtmath','rtargs','rtcont','rtmem','rterror']),
+	['rtpic','rtproc','rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror']),
 ('rpiece',    Split('rpiece.c') + [Version],
 	['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
 ('ranimate',  ['ranimate.c', '$RAD_NETCOMPAT'],
@@ -27,21 +27,31 @@ PROGS = [
 	'rtnet','rterror','$RAD_SOCKETLIB']),
 ('rtcontrib', ['rtcontrib.c', Version],
 	['rtpic','rtargs','rtfunc','rtio','rtproc','rtcont','rtmem','rtpath',
-	'rtmath','rtnet','rterror','$RAD_SOCKETLIB'])
+	'rtmath','rtnet','rterror','$RAD_SOCKETLIB']),
+('dctimestep', ['dctimestep.c'],
+	['rtall'])
 ]
 
 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
+#if os.name != 'nt': # XXX pending Windows version of raypcalls.c
+if True: # experimental raypwin.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)
+			LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
+			'rtcont','rtmem','rtargs','rtio','rtproc','rtpath','rterror']
+			+ mlib)
 	progs.append(ranimove)
+	rsensor = env.Program(target=radbin('rsensor'), source='rsensor.c',
+			CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
+ 			LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
+			'rtcont','rtmem','rtargs','rtio','rtpath','rterror','rtproc',
+			'rtlamps'] + mlib)
+	progs.append(rsensor)
 
 getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
 		LIBS=['rtio'])
@@ -52,10 +62,8 @@ 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)
 	progs.append(xglaresrc)
@@ -65,14 +73,14 @@ 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',
+			LIBS=['rgl','rtpic','rtscene','rtproc','rtpath','rtargs','rtio',
+			'rtmath','rtcont','rtmem','rterror','rtdummy',
 			'GL', 'GLU','X11'],)
 		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'''):
+	for s in Split('''objview objline objpict glare dayfact
+			debugcal rlux raddepend compamb vinfo genambpos fieldcomb'''):
 		Default(env.InstallCsh(radbin(s), s + '.csh'))
 # Those don't really work yet
 #else: